From 8fa3c1cec2073111822f1e924d5cf1a491e864cb Mon Sep 17 00:00:00 2001
From: Danny Mccormick <dannymccormick@google.com>
Date: Fri, 21 Mar 2025 09:55:26 -0400
Subject: [PATCH] Attempt to repro grpc issue with debugging

---
 sdks/go/test/run_validatesrunner_tests.sh | 2 ++
 sdks/python/setup.py                      | 8 ++++++--
 sdks/python/tox.ini                       | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sdks/go/test/run_validatesrunner_tests.sh b/sdks/go/test/run_validatesrunner_tests.sh
index 60dd0cd97f11..ecc6013a1c7f 100755
--- a/sdks/go/test/run_validatesrunner_tests.sh
+++ b/sdks/go/test/run_validatesrunner_tests.sh
@@ -287,6 +287,8 @@ if [[ "$RUNNER" == "flink" || "$RUNNER" == "spark" || "$RUNNER" == "samza" || "$
           --expansion-port 0 \
           --artifact-port 0 &
     elif [[ "$RUNNER" == "portable" ]]; then
+      export GRPC_VERBOSITY=debug
+      export GRPC_TRACE=all,-timer,-timer_check
       python3 \
           -m apache_beam.runners.portability.local_job_service_main \
           --port $JOB_PORT &
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 49d9ac368811..82d639c07f53 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -354,8 +354,12 @@ def get_portability_package_data():
           'cloudpickle~=2.2.1',
           'fastavro>=0.23.6,<2',
           'fasteners>=0.3,<1.0',
-          # TODO(https://github.com/grpc/grpc/issues/37710): Unpin grpc
-          'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1,<1.66.0',  # pylint: disable=line-too-long
+          # NOTE(https://github.com/grpc/grpc/issues/37710):
+          # Some grpc 1.66.0+ versions have a regression,
+          # which might not be reproducible in newer versions.
+          # internal bug number: 372274680
+          # external issue: https://github.com/grpc/grpc/issues/37710
+          'grpcio>=1.33.1,<1.71,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1',  # pylint: disable=line-too-long
           'hdfs>=2.1.0,<3.0.0',
           'httplib2>=0.8,<0.23.0',
           'jsonschema>=4.0.0,<5.0.0',
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index 25d44259fd75..8b6bb5df6c56 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -162,6 +162,12 @@ deps =
   pylint==2.17.5
   isort==4.2.15
   flake8==4.0.1
+# https://github.com/grpc/grpc/issues/37660: ignore pip check
+commands_pre =
+  python --version
+  pip --version
+  # pip check
+  bash {toxinidir}/scripts/run_tox_cleanup.sh
 commands =
   pylint --version
   time {toxinidir}/scripts/run_pylint.sh