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/10 22:58:40 UTC
[1/3] incubator-slider git commit: SLIDER-622 fix ZK instance
separation problems (windows doesn't to rmdir while cluster is in use)
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-622-windows 03a670a48 -> 23c71f587
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/022e9296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/022e9296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/022e9296
Branch: refs/heads/feature/SLIDER-622-windows
Commit: 022e9296b0f0cce05b82230739f98b4949505077
Parents: 03a670a
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 21:31:55 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 21:31:55 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/022e9296/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")
[3/3] incubator-slider git commit: SLIDER-622 :
TestStandaloneYarnRegistryAM - fix ZK instance separation problems (windows
doesn't to rmdir while cluster is in use)
Posted by st...@apache.org.
SLIDER-622 : TestStandaloneYarnRegistryAM - 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/23c71f58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/23c71f58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/23c71f58
Branch: refs/heads/feature/SLIDER-622-windows
Commit: 23c71f58780b2e9bdbe5da6afa7d636869354ca1
Parents: 942791e
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 21:58:22 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 21:58:22 2014 +0000
----------------------------------------------------------------------
.../groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/23c71f58/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
index d5d7ecf..f6b13a4 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
@@ -100,7 +100,7 @@ public abstract class YarnZKMiniClusterTestBase extends YarnMiniClusterTestBase
int numLogDirs,
boolean startZK,
boolean startHDFS) {
- createMicroZKCluster("-${name?:'zk'}", conf)
+ createMicroZKCluster("-${name?:methodName.methodName}", conf)
conf.setBoolean(RegistryConstants.KEY_REGISTRY_ENABLED, true)
conf.set(RegistryConstants.KEY_REGISTRY_ZK_QUORUM, ZKBinding)
name = super.createMiniCluster(name, conf, noOfNodeManagers, numLocalDirs, numLogDirs,
[2/3] incubator-slider git commit: SLIDER-622 pull fixup of
hadoop/bin from windows profile; needs to be done explicitly
Posted by st...@apache.org.
SLIDER-622 pull fixup of hadoop/bin from windows profile; needs to be done explicitly
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/942791e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/942791e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/942791e2
Branch: refs/heads/feature/SLIDER-622-windows
Commit: 942791e28b51e163fba5d9331669ca0b7bf31b6e
Parents: 022e929
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 21:43:17 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 21:43:17 2014 +0000
----------------------------------------------------------------------
pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/942791e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9db17b3..1049e40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1326,9 +1326,6 @@
<family>windows</family>
</os>
</activation>
- <properties>
- <test.env.path>${env.PATH}:${project.basedir}\bin\windows\${hadoop.version}\bin}</test.env.path>
- </properties>
<modules>
<module>app-packages/hbase-win</module>
<module>app-packages/storm-win</module>