From 8c6fc003e735ece1d6991c29b3c1d3ffae4cf44a Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 19 Apr 2024 12:30:45 +0800 Subject: [PATCH 1/4] chore: disable hyper hyper::client::connect::http by default Signed-off-by: xxchan --- src/utils/runtime/src/logger.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils/runtime/src/logger.rs b/src/utils/runtime/src/logger.rs index 7dd834afbcbd..7cc4194600b0 100644 --- a/src/utils/runtime/src/logger.rs +++ b/src/utils/runtime/src/logger.rs @@ -216,9 +216,7 @@ pub fn init_risingwave_logger(settings: LoggerSettings) { .with_target("sled", Level::INFO) .with_target("cranelift", Level::INFO) .with_target("wasmtime", Level::INFO) - .with_target("sqlx", Level::WARN) - // Expose hyper connection socket addr log. - .with_target("hyper::client::connect::http", Level::DEBUG); + .with_target("sqlx", Level::WARN); // For all other crates, apply default level depending on the deployment and `debug_assertions` flag. let default_level = match deployment { From c74d3c3aa459446207b98e8489ffc9079a10f2c1 Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 19 Apr 2024 12:32:29 +0800 Subject: [PATCH 2/4] update risedev Signed-off-by: xxchan --- Makefile.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 8b1a88707bb7..6db1dbb604b1 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -90,9 +90,9 @@ if ${is_not_ci} no_rust_log = not ${rust_log} if ${no_rust_log} - set_env RUST_LOG "pgwire_query_log=info,hyper::client::connect::http=info" + set_env RUST_LOG "pgwire_query_log=info" else - set_env RUST_LOG "pgwire_query_log=info,hyper::client::connect::http=info,${rust_log}" + set_env RUST_LOG "pgwire_query_log=info,${rust_log}" end end From be50972979dbe1237db1308137f83f99c9b8172a Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 19 Apr 2024 12:52:53 +0800 Subject: [PATCH 3/4] better logging Signed-off-by: xxchan --- ci/scripts/integration-tests.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ci/scripts/integration-tests.sh b/ci/scripts/integration-tests.sh index 90d23b2d8035..b9700d224655 100755 --- a/ci/scripts/integration-tests.sh +++ b/ci/scripts/integration-tests.sh @@ -24,17 +24,17 @@ shift $((OPTIND -1)) echo "export INTEGRATION_TEST_CASE=${case}" > env_vars.sh -echo "--- clean up docker" +echo "~~~ clean up docker" if [ $(docker ps -aq |wc -l) -gt 0 ]; then docker rm -f $(docker ps -aq) fi docker network prune -f docker volume prune -f -echo "--- ghcr login" +echo "~~~ ghcr login" echo "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin -echo "--- case: ${case}, format: ${format}" +echo "+++ set RW_IMAGE" if [[ -n "${RW_IMAGE_TAG+x}" ]]; then export RW_IMAGE="ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_TAG}" @@ -47,16 +47,22 @@ if [ "${BUILDKITE_SOURCE}" == "schedule" ]; then echo Docker image: "$RW_IMAGE" fi +if [ -z "${RW_IMAGE+x}" ]; then + echo "RW_IMAGE is not set. The image defined in docker-compose.yml will be used." +fi + +echo "--- case: ${case}, format: ${format}" + if [ "${case}" == "client-library" ]; then cd integration_tests/client-library python3 client_test.py exit 0 fi -echo "--- install postgresql" +echo "~~~ install postgresql" sudo yum install -y postgresql15 -echo "--- install poetry" +echo "~~~ install poetry" curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.0 python3 - From 3dfd7f0daa1da401e2c5ca134637bbe93a5af5fc Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 19 Apr 2024 13:09:43 +0800 Subject: [PATCH 4/4] Revert "better logging" This reverts commit be50972979dbe1237db1308137f83f99c9b8172a. --- ci/scripts/integration-tests.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ci/scripts/integration-tests.sh b/ci/scripts/integration-tests.sh index b9700d224655..90d23b2d8035 100755 --- a/ci/scripts/integration-tests.sh +++ b/ci/scripts/integration-tests.sh @@ -24,17 +24,17 @@ shift $((OPTIND -1)) echo "export INTEGRATION_TEST_CASE=${case}" > env_vars.sh -echo "~~~ clean up docker" +echo "--- clean up docker" if [ $(docker ps -aq |wc -l) -gt 0 ]; then docker rm -f $(docker ps -aq) fi docker network prune -f docker volume prune -f -echo "~~~ ghcr login" +echo "--- ghcr login" echo "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin -echo "+++ set RW_IMAGE" +echo "--- case: ${case}, format: ${format}" if [[ -n "${RW_IMAGE_TAG+x}" ]]; then export RW_IMAGE="ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_TAG}" @@ -47,22 +47,16 @@ if [ "${BUILDKITE_SOURCE}" == "schedule" ]; then echo Docker image: "$RW_IMAGE" fi -if [ -z "${RW_IMAGE+x}" ]; then - echo "RW_IMAGE is not set. The image defined in docker-compose.yml will be used." -fi - -echo "--- case: ${case}, format: ${format}" - if [ "${case}" == "client-library" ]; then cd integration_tests/client-library python3 client_test.py exit 0 fi -echo "~~~ install postgresql" +echo "--- install postgresql" sudo yum install -y postgresql15 -echo "~~~ install poetry" +echo "--- install poetry" curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.0 python3 -