Skip to content
Draft

Exp #41048

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Python_Versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ env:
OMP_NUM_THREADS: "1"
OPENBLAS_NUM_THREADS: "1"
# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
GRPC_ENABLE_FORK_SUPPORT: "0"
GRPC_ENABLE_FORK_SUPPORT: "1"
# gRPC stability - more conservative for unstable networks
GRPC_ARG_KEEPALIVE_TIME_MS: "10000"
GRPC_ARG_KEEPALIVE_TIMEOUT_MS: "15000"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_GoPortable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ concurrency:
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.BEAM_DEVELOCITY_ACCESS_KEY }}
# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
GRPC_ENABLE_FORK_SUPPORT: '0'
GRPC_ENABLE_FORK_SUPPORT: '1'

# Setting explicit permissions for the action
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_Python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ env:
OMP_NUM_THREADS: "1"
OPENBLAS_NUM_THREADS: "1"
# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
GRPC_ENABLE_FORK_SUPPORT: "0"
GRPC_ENABLE_FORK_SUPPORT: "1"
# gRPC stability - more conservative for unstable networks
GRPC_ARG_KEEPALIVE_TIME_MS: "10000"
GRPC_ARG_KEEPALIVE_TIMEOUT_MS: "15000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class PortableRunnerTestWithSubprocesses(PortableRunnerTest):
@classmethod
def setUpClass(cls):
cls._old_fork_support = os.environ.get('GRPC_ENABLE_FORK_SUPPORT')
os.environ['GRPC_ENABLE_FORK_SUPPORT'] = 'false'
os.environ['GRPC_ENABLE_FORK_SUPPORT'] = 'true'
super().setUpClass()

# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/utils/subprocess_server_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class JavaJarServerTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls._old_fork_support = os.environ.get('GRPC_ENABLE_FORK_SUPPORT')
os.environ['GRPC_ENABLE_FORK_SUPPORT'] = 'false'
os.environ['GRPC_ENABLE_FORK_SUPPORT'] = 'true'
super().setUpClass()

# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def get_portability_package_data():
'cryptography>=50.0.0',
'fastavro>=0.23.6,<2',
'fasteners>=0.3,<1.0',
'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1,!=1.66.*,!=1.67.*,!=1.68.*,!=1.69.*,!=1.70.*', # pylint: disable=line-too-long
'grpcio @ https://raw.githubusercontent.com/asheshvidyut/testing/main/grpcio-1.86.0.dev0-cp311-cp311-linux_x86_64.whl', # pylint: disable=line-too-long
'httplib2>=0.8,<1.0.0',
'jsonpickle>=3.0.4,<5.0.0',
# numpy can have breaking changes in minor versions.
Expand Down
4 changes: 3 additions & 1 deletion sdks/python/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ setenv =
RUN_SKIPPED_PY3_TESTS=0
# Set before importing gRPC; test-class setup is too late.
# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
GRPC_ENABLE_FORK_SUPPORT=0
GRPC_ENABLE_FORK_SUPPORT=1
# Make Cython mandatory when pip builds grpcio from source (see setup.py).
GRPC_PYTHON_BUILD_WITH_CYTHON=1
# Use an isolated tmp dir for tests that get slowed down by scanning /tmp.
TMPDIR={envtmpdir}
# Silence warning about ignoring PYTHONPATH.
Expand Down
Loading