You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/12/02 20:22:01 UTC

incubator-streams git commit: rolling back https://github.com/apache/incubator-streams/pull/140 to address critical test failures per STREAMS-238 STREAMS-230 should be re-opened

Repository: incubator-streams
Updated Branches:
  refs/heads/master e9adcac1a -> fd86c8fea


rolling back https://github.com/apache/incubator-streams/pull/140
to address critical test failures per STREAMS-238
STREAMS-230 should be re-opened


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/fd86c8fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/fd86c8fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/fd86c8fe

Branch: refs/heads/master
Commit: fd86c8feada17fe1dd9bcdd94305c68685a8bb6e
Parents: e9adcac
Author: sblackmon <sb...@w2odigital.com>
Authored: Tue Dec 2 12:54:40 2014 -0600
Committer: sblackmon <sb...@w2odigital.com>
Committed: Tue Dec 2 12:54:40 2014 -0600

----------------------------------------------------------------------
 .../org/apache/streams/local/builders/LocalStreamBuilder.java  | 6 +++---
 .../apache/streams/local/builders/LocalStreamBuilderTest.java  | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/fd86c8fe/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
index d0a82cb..7938247 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
@@ -18,7 +18,6 @@
 
 package org.apache.streams.local.builders;
 
-import com.google.common.base.Strings;
 import org.apache.streams.core.*;
 import org.apache.streams.local.counters.StreamsTaskCounter;
 import org.apache.streams.local.executors.ShutdownStreamOnUnhandleThrowableThreadPoolExecutor;
@@ -205,8 +204,8 @@ public class LocalStreamBuilder implements StreamBuilder {
         boolean forcedShutDown = false;
 
         try {
-            if( broadcastMonitor.getWaitTime() != -1 )
-                this.monitor.submit(broadcastMonitor);
+            monitorThread = new LocalStreamProcessMonitorThread(executor, 10);
+            this.monitor.submit(monitorThread);
             setupComponentTasks(tasks);
             setupProviderTasks(provTasks);
             LOGGER.info("Started stream with {} components", tasks.size());
@@ -316,6 +315,7 @@ public class LocalStreamBuilder implements StreamBuilder {
                 this.futures.put(task, this.executor.submit(task));
                 compTasks.add(task);
                 if( comp.isOperationCountable() ) {
+                    this.monitor.submit(broadcastMonitor);
                     this.monitor.submit(new StatusCounterMonitorThread((DatumStatusCountable) comp.getOperation(), 10));
                     this.monitor.submit(new StatusCounterMonitorThread((DatumStatusCountable) task, 10));
                 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/fd86c8fe/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
index 28c8502..ed67003 100644
--- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
+++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
@@ -233,9 +233,7 @@ public class LocalStreamBuilderTest extends RandomizedTest {
             int numDatums2 = randomIntBetween(1, 300000);
             StreamsProcessor processor1 = new PassthroughDatumCounterProcessor("proc1");
             StreamsProcessor processor2 = new PassthroughDatumCounterProcessor("proc2");
-            Map<String, Object> streamConfig = Maps.newHashMap();
-            streamConfig.put("monitoring_broadcast_interval_ms", -1);
-            StreamBuilder builder = new LocalStreamBuilder(streamConfig);
+            StreamBuilder builder = new LocalStreamBuilder();
             builder.newPerpetualStream("sp1", new NumericMessageProvider(numDatums1))
                     .newPerpetualStream("sp2", new NumericMessageProvider(numDatums2))
                     .addStreamsProcessor("proc1", processor1, 1, "sp1")