This is an automated email from the ASF dual-hosted git repository. kenn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
from f4d03d49713 Minimize scope of expensive lock (#30679) add 8681ab9901d Revert "Cache and close windmill grpc channels (#30425)" new cdaae0a7fb6 Merge pull request #30691: Revert #30425 "add a way for channels to be closed manually" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../google-cloud-dataflow-java/worker/build.gradle | 12 -- .../dataflow/worker/StreamingDataflowWorker.java | 11 +- .../worker/windmill/WindmillConnection.java | 5 - .../windmill/client/grpc/GrpcDispatcherClient.java | 4 +- .../windmill/client/grpc/GrpcWindmillServer.java | 29 +--- .../client/grpc/StreamingEngineClient.java | 25 ++-- .../windmill/client/grpc/stubs/ChannelCache.java | 117 ---------------- .../grpc/stubs/ChannelCachingStubFactory.java | 38 ------ .../client/grpc/stubs/IsolationChannel.java | 2 +- ...Factory.java => RemoteWindmillStubFactory.java} | 38 +++--- .../client/grpc/stubs/WindmillChannelFactory.java | 2 +- .../client/grpc/GrpcWindmillServerTest.java | 3 +- .../client/grpc/StreamingEngineClientTest.java | 31 +++-- .../client/grpc/WindmillStreamSenderTest.java | 3 +- .../client/grpc/stubs/ChannelCacheTest.java | 150 --------------------- .../windmill/testing/FakeWindmillStubFactory.java | 27 ++-- .../budget/EvenGetWorkBudgetDistributorTest.java | 7 +- 17 files changed, 78 insertions(+), 426 deletions(-) delete mode 100644 runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/client/grpc/stubs/ChannelCache.java delete mode 100644 runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/client/grpc/stubs/ChannelCachingStubFactory.java rename runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/client/grpc/stubs/{ChannelCachingRemoteStubFactory.java => RemoteWindmillStubFactory.java} (67%) delete mode 100644 runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/client/grpc/stubs/ChannelCacheTest.java