From a45d8da2046f686e2a4b8d7aedd3df2525d3495a Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 21 Sep 2020 11:12:38 -0700 Subject: [PATCH 1/8] Add debugging output to xds scripts --- packages/grpc-js/interop/xds-interop-client.ts | 3 +++ packages/grpc-js/scripts/xds.sh | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/grpc-js/interop/xds-interop-client.ts b/packages/grpc-js/interop/xds-interop-client.ts index 3009541c..daaf4761 100644 --- a/packages/grpc-js/interop/xds-interop-client.ts +++ b/packages/grpc-js/interop/xds-interop-client.ts @@ -15,6 +15,9 @@ * */ +console.log(`Running xDS interop client on node ${process.version} from ${process.argv[0]}`); +console.log(`PATH: ${process.env.PATH}`); + import * as grpc from '../src'; import { ProtoGrpcType } from './generated/test'; diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index 1c815fda..f6c18770 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -34,6 +34,10 @@ echo "source $NVM_DIR/nvm.sh" > ~/.profile echo "source $NVM_DIR/nvm.sh" > ~/.shrc export ENV=~/.shrc +echo $PATH +which node +node -v + cd $base npm install @@ -43,7 +47,9 @@ git clone -b master --single-branch --depth=1 https://github.com/grpc/grpc.git grpc/tools/run_tests/helper_scripts/prep_xds.sh -GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver GRPC_NODE_VERBOSITY=DEBUG \ +GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver + GRPC_NODE_VERBOSITY=DEBUG \ + NODE_XDS_INTEROP_VERBOSITY=1 \ python3 grpc/tools/run_tests/run_xds_tests.py \ --test_case="backends_restart,change_backend_service,gentle_failover,ping_pong,remove_instance_group,round_robin,secondary_locality_gets_no_requests_on_partial_primary_failure,secondary_locality_gets_requests_on_primary_failure" \ --project_id=grpc-testing \ From 6e0f6e2f8a41ab30c78822d389634d3cac20369d Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 21 Sep 2020 11:13:19 -0700 Subject: [PATCH 2/8] Borrow linux kokoro job for xds tests (revert before merging) --- test/kokoro/linux.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/kokoro/linux.cfg b/test/kokoro/linux.cfg index f40e6db4..04fa7333 100644 --- a/test/kokoro/linux.cfg +++ b/test/kokoro/linux.cfg @@ -15,10 +15,11 @@ # Config file for Kokoro (in protobuf text format) # Location of the continuous shell script in repository. -build_file: "grpc-node/test/kokoro.sh" -timeout_mins: 60 +build_file: "grpc-node/packages/grpc-js/scripts/xds.sh" +timeout_mins: 120 action { define_artifacts { - regex: "github/grpc-node/reports/**/sponge_log.xml" + regex: "github/grpc/reports/**" } } + From c259edd7f89a2c01b6e09c6dd6d3e3b9fb375346 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 21 Sep 2020 13:33:37 -0700 Subject: [PATCH 3/8] Patch xds python script with debug logging --- 0001-Add-PATH-logging.patch | 32 ++++++++++++++++++++++++++++++++ packages/grpc-js/scripts/xds.sh | 4 ++++ 2 files changed, 36 insertions(+) create mode 100644 0001-Add-PATH-logging.patch diff --git a/0001-Add-PATH-logging.patch b/0001-Add-PATH-logging.patch new file mode 100644 index 00000000..29c410a2 --- /dev/null +++ b/0001-Add-PATH-logging.patch @@ -0,0 +1,32 @@ +From 0761cc8780a5f94c10f187dbcd8d8e70c7b52577 Mon Sep 17 00:00:00 2001 +From: Michael Lumish +Date: Mon, 21 Sep 2020 13:28:08 -0700 +Subject: [PATCH] Add PATH logging + +--- + tools/run_tests/run_xds_tests.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/run_tests/run_xds_tests.py b/tools/run_tests/run_xds_tests.py +index 0cfa59e..df5a3f9 100755 +--- a/tools/run_tests/run_xds_tests.py ++++ b/tools/run_tests/run_xds_tests.py +@@ -1730,6 +1730,7 @@ try: + wait_for_healthy_backends(gcp, backend_service, instance_group) + + if args.test_case: ++ logger.debug('PATH: %s', os.environ['PATH']) + client_env = dict(os.environ) + bootstrap_server_features = [] + if gcp.service_port == _DEFAULT_SERVICE_PORT: +@@ -1800,6 +1801,7 @@ try: + rpcs_to_send=rpcs_to_send, + metadata_to_send=metadata_to_send) + logger.debug('running client: %s', client_cmd_formatted) ++ logger.debug('Using PATH: %s', client_env['PATH']) + client_cmd = shlex.split(client_cmd_formatted) + try: + client_process = subprocess.Popen(client_cmd, +-- +2.7.4 + diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index f6c18770..ad4744ec 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -45,6 +45,10 @@ cd ../../.. git clone -b master --single-branch --depth=1 https://github.com/grpc/grpc.git +cd grpc +git apply ../grpc-node/0001-Add-PATH-logging.patch +cd .. + grpc/tools/run_tests/helper_scripts/prep_xds.sh GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver From 2574952e06cc57fa033eefe1be1e868861e309b2 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 21 Sep 2020 14:15:21 -0700 Subject: [PATCH 4/8] Use full node path in client_cmd --- packages/grpc-js/scripts/xds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index ad4744ec..ae2362d6 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -61,7 +61,7 @@ GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weigh --path_to_server_binary=/java_server/grpc-java/interop-testing/build/install/grpc-interop-testing/bin/xds-test-server \ --gcp_suffix=$(date '+%s') \ --verbose \ - --client_cmd="node grpc-node/packages/grpc-js/build/interop/xds-interop-client \ + --client_cmd="$(which node) grpc-node/packages/grpc-js/build/interop/xds-interop-client \ --server=xds:///{server_uri} \ --stats_port={stats_port} \ --qps={qps} \ From ab5878e737f85d852aece8b92200e99929a43b8c Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 21 Sep 2020 16:32:46 -0700 Subject: [PATCH 5/8] Increase timeout for borrowed test --- test/kokoro/linux.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/kokoro/linux.cfg b/test/kokoro/linux.cfg index 04fa7333..e23febc6 100644 --- a/test/kokoro/linux.cfg +++ b/test/kokoro/linux.cfg @@ -16,7 +16,7 @@ # Location of the continuous shell script in repository. build_file: "grpc-node/packages/grpc-js/scripts/xds.sh" -timeout_mins: 120 +timeout_mins: 360 action { define_artifacts { regex: "github/grpc/reports/**" From 474a496a7a9695f3ad8fd4a9cc6e106bcb2e7be9 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Tue, 22 Sep 2020 00:47:55 -0700 Subject: [PATCH 6/8] Update submodules in xds test script --- packages/grpc-js/scripts/xds.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index ae2362d6..c15db9fc 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -39,6 +39,7 @@ which node node -v cd $base +git submodule update --init --recursive npm install cd ../../.. From fbdfcd4ee963ec3cb5a5aeea835c36278f119622 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Tue, 22 Sep 2020 10:56:11 -0700 Subject: [PATCH 7/8] Fix tracer setting lines in xds script --- packages/grpc-js/scripts/xds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index c15db9fc..ea472bc1 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -52,7 +52,7 @@ cd .. grpc/tools/run_tests/helper_scripts/prep_xds.sh -GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver +GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver \ GRPC_NODE_VERBOSITY=DEBUG \ NODE_XDS_INTEROP_VERBOSITY=1 \ python3 grpc/tools/run_tests/run_xds_tests.py \ From 0713b28da51de27311fbd204afff0c02d50d9b16 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Tue, 22 Sep 2020 12:09:13 -0700 Subject: [PATCH 8/8] Revert testing changes --- 0001-Add-PATH-logging.patch | 32 ------------------- .../grpc-js/interop/xds-interop-client.ts | 3 -- packages/grpc-js/scripts/xds.sh | 8 ----- test/kokoro/linux.cfg | 7 ++-- 4 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 0001-Add-PATH-logging.patch diff --git a/0001-Add-PATH-logging.patch b/0001-Add-PATH-logging.patch deleted file mode 100644 index 29c410a2..00000000 --- a/0001-Add-PATH-logging.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0761cc8780a5f94c10f187dbcd8d8e70c7b52577 Mon Sep 17 00:00:00 2001 -From: Michael Lumish -Date: Mon, 21 Sep 2020 13:28:08 -0700 -Subject: [PATCH] Add PATH logging - ---- - tools/run_tests/run_xds_tests.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/run_tests/run_xds_tests.py b/tools/run_tests/run_xds_tests.py -index 0cfa59e..df5a3f9 100755 ---- a/tools/run_tests/run_xds_tests.py -+++ b/tools/run_tests/run_xds_tests.py -@@ -1730,6 +1730,7 @@ try: - wait_for_healthy_backends(gcp, backend_service, instance_group) - - if args.test_case: -+ logger.debug('PATH: %s', os.environ['PATH']) - client_env = dict(os.environ) - bootstrap_server_features = [] - if gcp.service_port == _DEFAULT_SERVICE_PORT: -@@ -1800,6 +1801,7 @@ try: - rpcs_to_send=rpcs_to_send, - metadata_to_send=metadata_to_send) - logger.debug('running client: %s', client_cmd_formatted) -+ logger.debug('Using PATH: %s', client_env['PATH']) - client_cmd = shlex.split(client_cmd_formatted) - try: - client_process = subprocess.Popen(client_cmd, --- -2.7.4 - diff --git a/packages/grpc-js/interop/xds-interop-client.ts b/packages/grpc-js/interop/xds-interop-client.ts index daaf4761..3009541c 100644 --- a/packages/grpc-js/interop/xds-interop-client.ts +++ b/packages/grpc-js/interop/xds-interop-client.ts @@ -15,9 +15,6 @@ * */ -console.log(`Running xDS interop client on node ${process.version} from ${process.argv[0]}`); -console.log(`PATH: ${process.env.PATH}`); - import * as grpc from '../src'; import { ProtoGrpcType } from './generated/test'; diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index ea472bc1..ce2b6417 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -34,10 +34,6 @@ echo "source $NVM_DIR/nvm.sh" > ~/.profile echo "source $NVM_DIR/nvm.sh" > ~/.shrc export ENV=~/.shrc -echo $PATH -which node -node -v - cd $base git submodule update --init --recursive npm install @@ -46,10 +42,6 @@ cd ../../.. git clone -b master --single-branch --depth=1 https://github.com/grpc/grpc.git -cd grpc -git apply ../grpc-node/0001-Add-PATH-logging.patch -cd .. - grpc/tools/run_tests/helper_scripts/prep_xds.sh GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver \ diff --git a/test/kokoro/linux.cfg b/test/kokoro/linux.cfg index e23febc6..f40e6db4 100644 --- a/test/kokoro/linux.cfg +++ b/test/kokoro/linux.cfg @@ -15,11 +15,10 @@ # Config file for Kokoro (in protobuf text format) # Location of the continuous shell script in repository. -build_file: "grpc-node/packages/grpc-js/scripts/xds.sh" -timeout_mins: 360 +build_file: "grpc-node/test/kokoro.sh" +timeout_mins: 60 action { define_artifacts { - regex: "github/grpc/reports/**" + regex: "github/grpc-node/reports/**/sponge_log.xml" } } -