SLIDER-622 fix ZK instance separation problems (windows doesn't to rmdir while cluster is in use)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ad983d9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ad983d9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ad983d9e Branch: refs/heads/releases/slider-0.60 Commit: ad983d9effdaf57972c69e6d34f34b0144ac9a69 Parents: 167f931 Author: Steve Loughran <[email protected]> Authored: Mon Nov 10 21:31:55 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 10 22:48:10 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/common/tools/TestZKIntegration.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ad983d9e/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy index 1b7ea52..460dafb 100644 --- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy @@ -72,7 +72,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest assertHasZKCluster() ZKIntegration zki = createZKIntegrationInstance( - getZKBinding(), "", true, false, 5000) + getZKBinding(), methodName.methodName, true, false, 5000) String userPath = ZKIntegration.mkSliderUserPath(USER) String fullPath = zki.createPath(userPath, "/cluster-", ZooDefs.Ids.OPEN_ACL_UNSAFE, @@ -86,7 +86,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest @Test public void testListUserClustersWithTwoCluster() throws Throwable { ZKIntegration zki = createZKIntegrationInstance( - getZKBinding(), "", true, false, 5000) + getZKBinding(), methodName.methodName, true, false, 5000) String userPath = ZKIntegration.mkSliderUserPath(USER) String c1 = createEphemeralChild(zki, userPath) log.info("Ephemeral path $c1")
