SLIDER-622 ensuring unique names for instances in a test
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/eba57bb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/eba57bb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/eba57bb5 Branch: refs/heads/develop Commit: eba57bb508fc26ee96affcc79a5374af900d05d8 Parents: 89073b1 Author: Steve Loughran <[email protected]> Authored: Tue Nov 11 14:50:16 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 11 14:50:16 2014 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/slider/core/build/InstanceBuilder.java | 4 +++- .../org/apache/slider/providers/agent/TestBuildBasicAgent.groovy | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eba57bb5/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java b/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java index 669a5ad..cee2663 100644 --- a/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java +++ b/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java @@ -253,7 +253,9 @@ public class InstanceBuilder { IOException, SliderException, LockAcquireFailedException { - if (!overwrite) coreFS.createClusterDirectories(instancePaths); + if (!overwrite) { + coreFS.createClusterDirectories(instancePaths); + } ConfPersister persister = new ConfPersister(coreFS, getInstanceDir()); ConfDirSnapshotAction action = null; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eba57bb5/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestBuildBasicAgent.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestBuildBasicAgent.groovy b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestBuildBasicAgent.groovy index 3f7a432..264d260 100644 --- a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestBuildBasicAgent.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestBuildBasicAgent.groovy @@ -171,7 +171,7 @@ class TestBuildBasicAgent extends AgentTestBase { } try { - launcher = buildAgentCluster(clustername, + launcher = buildAgentCluster(clustername + "-10", [ (ROLE_NODE): 4, ],
