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/09/04 20:01:15 UTC

[1/3] git commit: SLIDER-1 steve broke jenkins. reverting

Repository: incubator-slider
Updated Branches:
  refs/heads/develop 6126db62b -> 930920d24


SLIDER-1 steve broke jenkins. reverting


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bd0cdd1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bd0cdd1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bd0cdd1c

Branch: refs/heads/develop
Commit: bd0cdd1c4bda4479d75f3e83f07e4802ff71e8b6
Parents: a0a3ae6
Author: Steve Loughran <st...@apache.org>
Authored: Thu Sep 4 18:53:11 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Sep 4 18:53:11 2014 +0100

----------------------------------------------------------------------
 .../hbase/minicluster/masterless/TestRoleOptPropagation.groovy   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bd0cdd1c/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
index dd9b8e9..cffde39 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
@@ -30,6 +30,8 @@ import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
 import org.apache.slider.core.main.ServiceLauncher
 import org.junit.Test
 
+import static HBaseKeys.PROVIDER_HBASE
+import static Arguments.ARG_PROVIDER
 
 @CompileStatic
 @Slf4j
@@ -52,7 +54,7 @@ class TestRoleOptPropagation extends HBaseMiniClusterTestBase {
                    ],
                    [
                        Arguments.ARG_COMP_OPT, HBaseKeys.ROLE_MASTER, ENV, "4",
-                       Arguments.ARG_PROVIDER, HBaseKeys.PROVIDER_HBASE
+                       ARG_PROVIDER, PROVIDER_HBASE
                    ],
                    true,
                    true,


[2/3] git commit: SLIDER-395 testZKIntegration broken

Posted by st...@apache.org.
SLIDER-395 testZKIntegration broken


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b7f37ea2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b7f37ea2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b7f37ea2

Branch: refs/heads/develop
Commit: b7f37ea2b1f6842fab57b37a6b54b08209b895aa
Parents: bd0cdd1
Author: Steve Loughran <st...@apache.org>
Authored: Thu Sep 4 19:00:42 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Sep 4 19:00:42 2014 +0100

----------------------------------------------------------------------
 .../slider/common/tools/TestZKIntegration.groovy    | 16 +++++++++++-----
 .../slider/test/YarnZKMiniClusterTestBase.groovy    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b7f37ea2/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 c13af78..836edbd 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
@@ -48,7 +48,8 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
   @Test
   public void testIntegrationCreate() throws Throwable {
     assertHasZKCluster()
-    ZKIntegration zki = createZKIntegrationInstance(ZKBinding, "cluster1", true, false, 5000)
+    ZKIntegration zki = createZKIntegrationInstance(
+        getZKBinding(), "cluster1", true, false, 5000)
     String userPath = ZKIntegration.mkSliderUserPath(USER)
     Stat stat = zki.stat(userPath)
     assert stat != null
@@ -59,7 +60,8 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
   public void testListUserClustersWithoutAnyClusters() throws Throwable {
     assertHasZKCluster()
 
-    ZKIntegration zki = createZKIntegrationInstance(ZKBinding, "", true, false, 5000)
+    ZKIntegration zki = createZKIntegrationInstance(
+        getZKBinding(), "", true, false, 5000)
     String userPath = ZKIntegration.mkSliderUserPath(USER)
     List<String> clusters = zki.clusters
     assert clusters.empty
@@ -69,7 +71,8 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
   public void testListUserClustersWithOneCluster() throws Throwable {
     assertHasZKCluster()
 
-    ZKIntegration zki = createZKIntegrationInstance(ZKBinding, "", true, false, 5000)
+    ZKIntegration zki = createZKIntegrationInstance(
+        getZKBinding(), "", true, false, 5000)
     String userPath = ZKIntegration.mkSliderUserPath(USER)
     String fullPath = zki.createPath(userPath, "/cluster-",
                                      ZooDefs.Ids.OPEN_ACL_UNSAFE,
@@ -82,7 +85,8 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
 
   @Test
   public void testListUserClustersWithTwoCluster() throws Throwable {
-    ZKIntegration zki = createZKIntegrationInstance(ZKBinding, "", true, false, 5000)
+    ZKIntegration zki = createZKIntegrationInstance(
+        getZKBinding(), "", true, false, 5000)
     String userPath = ZKIntegration.mkSliderUserPath(USER)
     String c1 = createEphemeralChild(zki, userPath)
     log.info("Ephemeral path $c1")
@@ -110,6 +114,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
 
     path = client.createZookeeperNode("cl1", false)
     zki = client.lastZKIntegration
+    assert zki 
     assert zkPath == "/services/slider/users/" + USER + "/cl1", "zkPath must be as expected"
     assert path == zkPath
     assert zki.exists(zkPath)
@@ -135,7 +140,8 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
 
     @Override
     protected ZKIntegration getZkClient(String clusterName, String user) {
-      createZKIntegrationInstance(ZKBinding, "cl1", true, false, 5000)
+      zki = createZKIntegrationInstance(getZKBinding(), "cl1", true, false, 5000)
+      return zki;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b7f37ea2/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 0259fb7..9b5f082 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
@@ -147,7 +147,7 @@ public abstract class YarnZKMiniClusterTestBase extends YarnMiniClusterTestBase
     assert microZKCluster != null
   }
 
-  protected String getZKBinding() {
+  public String getZKBinding() {
     if (!microZKCluster) {
       return "localhost:1"
     } else {


[3/3] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop

Posted by st...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/930920d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/930920d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/930920d2

Branch: refs/heads/develop
Commit: 930920d245bb354cbfbec43391a203bd6db04fa4
Parents: b7f37ea 6126db6
Author: Steve Loughran <st...@apache.org>
Authored: Thu Sep 4 19:00:55 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Sep 4 19:00:55 2014 +0100

----------------------------------------------------------------------
 pom.xml | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------