You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/11 16:05:20 UTC
[17/17] incubator-slider git commit: SLIDER-622 ensuring unique names
for instances in a test
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/56e16c39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/56e16c39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/56e16c39
Branch: refs/heads/releases/slider-0.60
Commit: 56e16c391524f8799a6f5d56beaafaf968a5c5c8
Parents: f532489
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 14:50:16 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:47 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/56e16c39/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/56e16c39/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,
],