You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by na...@apache.org on 2017/07/26 00:05:01 UTC
samza git commit: Fix build failures after master merge
Repository: samza
Updated Branches:
refs/heads/master 57758615b -> 95d96b944
Fix build failures after master merge
Changes
* Fix checkstyle errors from #243
* Fix failure after bad merge in #244
Author: Shanthoosh Venkataraman <sv...@linkedin.com>
Reviewers: Navina Ramesh <na...@apache.org>
Closes #252 from shanthoosh/fix_NPE_after_master_merge
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/95d96b94
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/95d96b94
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/95d96b94
Branch: refs/heads/master
Commit: 95d96b9444f86cc34b4faf0790834e692922fc1e
Parents: 5775861
Author: Shanthoosh Venkataraman <sv...@linkedin.com>
Authored: Tue Jul 25 17:04:53 2017 -0700
Committer: navina <na...@apache.org>
Committed: Tue Jul 25 17:04:53 2017 -0700
----------------------------------------------------------------------
.../org/apache/samza/clustermanager/MockContainerAllocator.java | 1 -
.../apache/samza/clustermanager/TestContainerProcessManager.java | 4 ++--
.../src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java | 3 +++
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/95d96b94/samza-core/src/test/java/org/apache/samza/clustermanager/MockContainerAllocator.java
----------------------------------------------------------------------
diff --git a/samza-core/src/test/java/org/apache/samza/clustermanager/MockContainerAllocator.java b/samza-core/src/test/java/org/apache/samza/clustermanager/MockContainerAllocator.java
index 449b484..0c78b5e 100644
--- a/samza-core/src/test/java/org/apache/samza/clustermanager/MockContainerAllocator.java
+++ b/samza-core/src/test/java/org/apache/samza/clustermanager/MockContainerAllocator.java
@@ -23,7 +23,6 @@ import org.apache.samza.config.Config;
import java.lang.reflect.Field;
import java.util.Map;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/samza/blob/95d96b94/samza-core/src/test/java/org/apache/samza/clustermanager/TestContainerProcessManager.java
----------------------------------------------------------------------
diff --git a/samza-core/src/test/java/org/apache/samza/clustermanager/TestContainerProcessManager.java b/samza-core/src/test/java/org/apache/samza/clustermanager/TestContainerProcessManager.java
index 6978341..4288aea 100644
--- a/samza-core/src/test/java/org/apache/samza/clustermanager/TestContainerProcessManager.java
+++ b/samza-core/src/test/java/org/apache/samza/clustermanager/TestContainerProcessManager.java
@@ -255,7 +255,7 @@ public class TestContainerProcessManager {
// Allow container to run and update state
- if (!allocator.awaitContainersStart(1,2, TimeUnit.SECONDS)) {
+ if (!allocator.awaitContainersStart(1, 2, TimeUnit.SECONDS)) {
fail("timed out waiting for the containers to start");
}
assertFalse(taskManager.shouldShutdown());
@@ -374,7 +374,7 @@ public class TestContainerProcessManager {
taskManager.onResourceAllocated(container);
// Allow container to run and update state
- if (!allocator.awaitContainersStart(1,2, TimeUnit.SECONDS)) {
+ if (!allocator.awaitContainersStart(1, 2, TimeUnit.SECONDS)) {
fail("timed out waiting for the containers to start");
}
http://git-wip-us.apache.org/repos/asf/samza/blob/95d96b94/samza-core/src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java
----------------------------------------------------------------------
diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java
index 9b5210f..fd6065a 100644
--- a/samza-core/src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java
+++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkJobCoordinator.java
@@ -19,6 +19,7 @@
package org.apache.samza.zk;
import java.util.HashMap;
+import org.I0Itec.zkclient.ZkClient;
import org.apache.samza.config.MapConfig;
import org.apache.samza.job.model.JobModel;
import org.apache.samza.util.NoOpMetricsRegistry;
@@ -32,10 +33,12 @@ public class TestZkJobCoordinator {
@Test
public void testFollowerShouldStopWhenNotPartOfGeneratedJobModel() {
ZkKeyBuilder keyBuilder = Mockito.mock(ZkKeyBuilder.class);
+ ZkClient mockZkClient = Mockito.mock(ZkClient.class);
Mockito.when(keyBuilder.getJobModelVersionBarrierPrefix()).thenReturn(TEST_BARRIER_ROOT);
ZkUtils zkUtils = Mockito.mock(ZkUtils.class);
Mockito.when(zkUtils.getKeyBuilder()).thenReturn(keyBuilder);
+ Mockito.when(zkUtils.getZkClient()).thenReturn(mockZkClient);
Mockito.when(zkUtils.getJobModel(TEST_JOB_MODEL_VERSION)).thenReturn(new JobModel(new MapConfig(), new HashMap<>()));
ZkJobCoordinator zkJobCoordinator = Mockito.spy(new ZkJobCoordinator(new MapConfig(), new NoOpMetricsRegistry(), zkUtils));