You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by bo...@apache.org on 2018/09/11 18:39:28 UTC

samza git commit: SAMZA-1865: Increase coordination timeouts in zookeeper integration tests.

Repository: samza
Updated Branches:
  refs/heads/master 0e0a939df -> 12b6d3030


SAMZA-1865: Increase coordination timeouts in zookeeper integration tests.

Author: Shanthoosh Venkataraman <sv...@linkedin.com>
Author: Shanthoosh Venkataraman <sp...@usc.edu>

Reviewers: Jagadish<ja...@apache.org>, Boris Shkolnik<bo...@apache.org>

Closes #632 from shanthoosh/fix_zk_crap


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/12b6d303
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/12b6d303
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/12b6d303

Branch: refs/heads/master
Commit: 12b6d30302a7d330e967e6ceba35c308eafe7d43
Parents: 0e0a939
Author: Shanthoosh Venkataraman <sv...@linkedin.com>
Authored: Tue Sep 11 11:39:07 2018 -0700
Committer: Boris S <bo...@apache.org>
Committed: Tue Sep 11 11:39:07 2018 -0700

----------------------------------------------------------------------
 .travis.yml                                                    | 4 ++--
 .../main/java/org/apache/samza/processor/StreamProcessor.java  | 2 +-
 .../samza/test/processor/TestZkLocalApplicationRunner.java     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/12b6d303/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2a3ae0c..601ceac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,8 @@ jdk:
   - oraclejdk8
 
 script:
-  ## travis_wait increases build idle-wait time from 10 minutes to 20 minutes.
-  - travis_wait 20 ./gradlew clean build
+  ## travis_wait increases build idle-wait time from 10 minutes to 30 minutes.
+  - travis_wait 30 ./gradlew clean build
   - type sonar-scanner &>/dev/null; if [ $? -eq 0 ]; then sonar-scanner; else echo "Not running sonar"; fi
 
 before_cache:

http://git-wip-us.apache.org/repos/asf/samza/blob/12b6d303/samza-core/src/main/java/org/apache/samza/processor/StreamProcessor.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/processor/StreamProcessor.java b/samza-core/src/main/java/org/apache/samza/processor/StreamProcessor.java
index 4ef9f9c..7910216 100644
--- a/samza-core/src/main/java/org/apache/samza/processor/StreamProcessor.java
+++ b/samza-core/src/main/java/org/apache/samza/processor/StreamProcessor.java
@@ -428,7 +428,7 @@ public class StreamProcessor {
     public void afterFailure(Throwable t) {
       containerShutdownLatch.countDown();
       synchronized (lock) {
-        LOGGER.error(String.format("Container: %s failed with an exception. Stopping the stream processor: %s. Original exception:", container, processorId), containerException);
+        LOGGER.error(String.format("Container: %s failed with an exception. Stopping the stream processor: %s. Original exception:", container, processorId), t);
         state = State.STOPPING;
         containerException = t;
         jobCoordinator.stop();

http://git-wip-us.apache.org/repos/asf/samza/blob/12b6d303/samza-test/src/test/java/org/apache/samza/test/processor/TestZkLocalApplicationRunner.java
----------------------------------------------------------------------
diff --git a/samza-test/src/test/java/org/apache/samza/test/processor/TestZkLocalApplicationRunner.java b/samza-test/src/test/java/org/apache/samza/test/processor/TestZkLocalApplicationRunner.java
index 3b2d08a..b249d4d 100644
--- a/samza-test/src/test/java/org/apache/samza/test/processor/TestZkLocalApplicationRunner.java
+++ b/samza-test/src/test/java/org/apache/samza/test/processor/TestZkLocalApplicationRunner.java
@@ -87,9 +87,9 @@ public class TestZkLocalApplicationRunner extends StandaloneIntegrationTestHarne
   private static final String TEST_TASK_GROUPER_FACTORY = "org.apache.samza.container.grouper.task.GroupByContainerIdsFactory";
   private static final String TEST_JOB_COORDINATOR_FACTORY = "org.apache.samza.zk.ZkJobCoordinatorFactory";
   private static final String TEST_SYSTEM_FACTORY = "org.apache.samza.system.kafka.KafkaSystemFactory";
-  private static final String TASK_SHUTDOWN_MS = "2000";
-  private static final String JOB_DEBOUNCE_TIME_MS = "2000";
-  private static final String BARRIER_TIMEOUT_MS = "2000";
+  private static final String TASK_SHUTDOWN_MS = "10000";
+  private static final String JOB_DEBOUNCE_TIME_MS = "10000";
+  private static final String BARRIER_TIMEOUT_MS = "10000";
   private static final String[] PROCESSOR_IDS = new String[] {"0000000000", "0000000001", "0000000002"};
 
   private String inputKafkaTopic;