You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/12/01 00:08:31 UTC
[1/2] incubator-beam git commit: Shutdown DynamicSplit Executor in
Cleanup
Repository: incubator-beam
Updated Branches:
refs/heads/master c8f2cdb22 -> 565e99fbf
Shutdown DynamicSplit Executor in Cleanup
This ensures that the threads will be shut off when the pipeline shuts
down, enabling a JVM with no more work to do to shut down as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6ef9a288
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6ef9a288
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6ef9a288
Branch: refs/heads/master
Commit: 6ef9a288e281a423905c2cba520274d1c4e4747b
Parents: c8f2cdb
Author: Thomas Groh <tg...@google.com>
Authored: Wed Nov 30 14:30:14 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Nov 30 16:08:20 2016 -0800
----------------------------------------------------------------------
.../beam/runners/direct/BoundedReadEvaluatorFactory.java | 6 ++++--
.../beam/runners/direct/BoundedReadEvaluatorFactoryTest.java | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6ef9a288/runners/direct-java/src/main/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactory.java
index 65b622f..8874a04 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactory.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactory.java
@@ -58,7 +58,7 @@ final class BoundedReadEvaluatorFactory implements TransformEvaluatorFactory {
*/
private static final long REQUIRED_DYNAMIC_SPLIT_ORIGINAL_SIZE = 0;
private final EvaluationContext evaluationContext;
- private final ExecutorService executor = Executors.newCachedThreadPool();
+ @VisibleForTesting final ExecutorService executor = Executors.newCachedThreadPool();
private final long minimumDynamicSplitSize;
@@ -87,7 +87,9 @@ final class BoundedReadEvaluatorFactory implements TransformEvaluatorFactory {
}
@Override
- public void cleanup() {}
+ public void cleanup() {
+ executor.shutdown();
+ }
/**
* A {@link BoundedReadEvaluator} produces elements from an underlying {@link BoundedSource},
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6ef9a288/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
index dee95a7..b1ff689 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
@@ -335,6 +335,12 @@ public class BoundedReadEvaluatorFactoryTest {
assertThat(TestSource.readerClosed, is(true));
}
+ @Test
+ public void cleanupShutsDownExecutor() {
+ factory.cleanup();
+ assertThat(factory.executor.isShutdown(), is(true));
+ }
+
private static class TestSource<T> extends OffsetBasedSource<T> {
private static boolean readerClosed;
private final Coder<T> coder;
[2/2] incubator-beam git commit: Closes #1470
Posted by dh...@apache.org.
Closes #1470
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/565e99fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/565e99fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/565e99fb
Branch: refs/heads/master
Commit: 565e99fbf8f7a9e9863bdfcfb514e2098365bbc6
Parents: c8f2cdb 6ef9a28
Author: Dan Halperin <dh...@google.com>
Authored: Wed Nov 30 16:08:22 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Nov 30 16:08:22 2016 -0800
----------------------------------------------------------------------
.../beam/runners/direct/BoundedReadEvaluatorFactory.java | 6 ++++--
.../beam/runners/direct/BoundedReadEvaluatorFactoryTest.java | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------