From 06eba0d0f4665fe76a2fba7ca84d5d4890b79c3d Mon Sep 17 00:00:00 2001 From: Boris Shkolnik Date: Wed, 10 May 2017 11:27:41 -0700 Subject: [PATCH 1/4] re-enable the test --- .../org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java index f1bb80454a..7574695ad2 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java @@ -74,8 +74,7 @@ public static void teardown() { zkServer.teardown(); } - // TODO: SAMZA-1193 fix the following flaky test and re-enable it - // @Test + @Test public void testZkBarrierForVersionUpgrade() { String barrierId = "b1"; String ver = "1"; From d1e3a64a41bb6c166a2ccf4e817e26c77884364a Mon Sep 17 00:00:00 2001 From: Boris Shkolnik Date: Mon, 15 May 2017 10:38:13 -0700 Subject: [PATCH 2/4] moved initializtion of the embedded zk into beforeTest --- .../zk/TestZkBarrierForVersionUpgrade.java | 23 +++++++++---------- .../samza/monitor/TestLocalStoreMonitor.java | 9 ++------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java index 7574695ad2..19cde6da8e 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java @@ -18,6 +18,11 @@ */ package org.apache.samza.zk; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import junit.framework.Assert; import org.apache.samza.config.Config; import org.apache.samza.config.MapConfig; @@ -29,31 +34,25 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class TestZkBarrierForVersionUpgrade { private static EmbeddedZookeeper zkServer = null; private static String testZkConnectionString = null; private static CoordinationUtils coordinationUtils; + private static AtomicInteger counter = new AtomicInteger(1); + + + @Before + public void testSetup() { - @BeforeClass - public static void setup() throws InterruptedException { zkServer = new EmbeddedZookeeper(); zkServer.setup(); testZkConnectionString = "127.0.0.1:" + zkServer.getPort(); - } - @Before - public void testSetup() { - String groupId = "group1"; + String groupId = "group" + counter.getAndAdd(1); String processorId = "p1"; Map map = new HashMap<>(); map.put(ZkConfig.ZK_CONNECT, testZkConnectionString); diff --git a/samza-rest/src/test/java/org/apache/samza/monitor/TestLocalStoreMonitor.java b/samza-rest/src/test/java/org/apache/samza/monitor/TestLocalStoreMonitor.java index 971eaa4551..2ad6935730 100644 --- a/samza-rest/src/test/java/org/apache/samza/monitor/TestLocalStoreMonitor.java +++ b/samza-rest/src/test/java/org/apache/samza/monitor/TestLocalStoreMonitor.java @@ -97,8 +97,8 @@ public void cleanUp() { } } -// TODO: Fix in SAMZA-1243 -// @Test + // TODO fix in SAMZA-1243 + // @Test public void shouldDeleteLocalTaskStoreWhenItHasNoOffsetFile() throws Exception { localStoreMonitor.monitor(); assertTrue("Task store directory should not exist.", !taskStoreDir.exists()); @@ -148,13 +148,8 @@ public void shouldDoNothingWhenTheJobIsRunning() throws Exception { assertEquals(0, localStoreMonitorMetrics.diskSpaceFreedInBytes.getCount()); } -<<<<<<< HEAD // TODO fix in SAMZA-1243 // @Test -======= -// TODO: Fix in SAMZA-1243 -// @Test ->>>>>>> Disable flaky tests. public void shouldDeleteTaskStoreWhenTaskPreferredStoreIsNotLocalHost() throws Exception { Task task = new Task("notLocalHost", "test-task", "0", new ArrayList<>(), ImmutableList.of("test-store")); From 007629388ab4d45245a2890b051ab04d57b092e2 Mon Sep 17 00:00:00 2001 From: Boris Shkolnik Date: Tue, 16 May 2017 10:18:57 -0700 Subject: [PATCH 3/4] merge and review comment --- .../org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java index 19cde6da8e..27975e400b 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java @@ -66,10 +66,6 @@ public void testSetup() { @After public void testTearDown() { coordinationUtils.reset(); - } - - @AfterClass - public static void teardown() { zkServer.teardown(); } From bfab0d788b76779121f10f300899cf95d90cddb6 Mon Sep 17 00:00:00 2001 From: Boris Shkolnik Date: Tue, 16 May 2017 11:32:05 -0700 Subject: [PATCH 4/4] checkstyle --- .../java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java | 1 - 1 file changed, 1 deletion(-) diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java index 27975e400b..547e32b428 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java @@ -32,7 +32,6 @@ import org.apache.samza.coordinator.CoordinationUtils; import org.apache.samza.testUtils.EmbeddedZookeeper; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Test;