You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by el...@apache.org on 2014/11/22 23:04:32 UTC
[01/50] incubator-slider git commit: SLIDER-622 & then cut checks for
awk and xargs
Repository: incubator-slider
Updated Branches:
refs/heads/master 8434b8971 -> b70d830ae
SLIDER-622 & then cut checks for awk and xargs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/167f9314
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/167f9314
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/167f9314
Branch: refs/heads/master
Commit: 167f931421027de808bbf38b825f929e37962263
Parents: 90f6dd8
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 21:06:20 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../org/apache/slider/common/tools/TestWindowsSupport.groovy | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/167f9314/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 769233e..198bd82 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -104,17 +104,21 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
}
+/*
@Test
public void testHasGawkInstalled() throws Throwable {
assume(Shell.WINDOWS, "not windows")
exec(0, ["gawk", "--version"])
}
+*/
+/*
@Test
public void testHasXargsInstalled() throws Throwable {
assume(Shell.WINDOWS, "not windows")
exec(0, ["xargs", "--version"])
}
+*/
@Test
public void testExecNonexistentBinary() throws Throwable {
[20/50] incubator-slider git commit: Storm default secured config
needs a change
Posted by el...@apache.org.
Storm default secured config needs a change
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1ef5a95f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1ef5a95f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1ef5a95f
Branch: refs/heads/master
Commit: 1ef5a95f37dd33cfcc2398b674fff04bb495ea35
Parents: 0e4c5da
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 16:31:10 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 16:31:10 2014 -0800
----------------------------------------------------------------------
app-packages/storm/appConfig-secured-default.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ef5a95f/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index ec42acd..973c79a 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -37,7 +37,7 @@
"site.storm-site.nimbus.authorizer": "backtype.storm.security.auth.authorizer.SimpleACLAuthorizer",
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
- "site.storm-site.java.security.auth.login.config": "${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/conf/storm_jaas.conf",
+ "site.storm-site.java.security.auth.login.config": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
"site.storm-site.storm.zookeeper.superACL": "PLACE_JAAS_CLIENT_PRINCIPAL_HERE",
"site.storm-site.nimbus.admins": "['${USER_NAME}', 'PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE']",
[38/50] incubator-slider git commit: SLIDER-544 updating release POMs
for 0.60.0-incubating
Posted by el...@apache.org.
SLIDER-544 updating release POMs for 0.60.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/50158dc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/50158dc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/50158dc9
Branch: refs/heads/master
Commit: 50158dc91e6d6ddc70a898631f0530425fcce125
Parents: 4bb804a
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 20:40:09 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 20:40:09 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
slider-providers/accumulo/accumulo-funtests/pom.xml | 2 +-
slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
slider-providers/hbase/slider-hbase-provider/pom.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index ae00b33..469ca85 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index f5364de..2c1fd46 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index c413b8c..f7514dc 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index fc0a2e3..55c4c53 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 1c7fba6..6caef05 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 8db9111..3b4cb9d 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index c9418e6..00ec044 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a5e6ba..5a1d55c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 1bbea9d..332d5d1 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index b6f20c0..cd4b6e6 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 5e1d8ab..9c616c3 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index aa11f57..b5ef62e 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index 0364fbd..ec48f59 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index 7e2a678..99d7b65 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 9752f74..dd55a93 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/50158dc9/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index 1ff467e..71c4d27 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60-incubating</version>
+ <version>0.60.0-incubating</version>
<relativePath>../../../</relativePath>
</parent>
[33/50] incubator-slider git commit: SLIDER-622 ensuring unique names
for instances in a test
Posted by el...@apache.org.
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/master
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,
],
[08/50] incubator-slider git commit: SLIDER-622 fixed erroneous
negation
Posted by el...@apache.org.
SLIDER-622 fixed erroneous negation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/954b0a2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/954b0a2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/954b0a2c
Branch: refs/heads/master
Commit: 954b0a2c58c19cee4e04c535ca116744e4c56756
Parents: 75e6efc
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 17:50:28 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/common/tools/SliderUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/954b0a2c/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index fa3f0bd..f4cea00 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -1910,7 +1910,7 @@ public final class SliderUtils {
String errorText = null;
process.start();
try {
- if (process.waitForServiceToStop(timeoutMillis)) {
+ if (!process.waitForServiceToStop(timeoutMillis)) {
throw new TimeoutException(
"Process did not stop in " + timeoutMillis + "mS");
}
[41/50] incubator-slider git commit: Storm super ACL default value
should be without realm
Posted by el...@apache.org.
Storm super ACL default value should be without realm
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/aa1bd194
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aa1bd194
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aa1bd194
Branch: refs/heads/master
Commit: aa1bd1945dd99bb189f9c31b3357aab2d456ce16
Parents: e87ab7c
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Nov 11 16:08:51 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Nov 12 17:22:34 2014 -0800
----------------------------------------------------------------------
app-packages/storm/appConfig-secured-default.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa1bd194/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index 21d32e5..4c40ddf 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -39,7 +39,7 @@
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
"site.storm-site.java.security.auth.login.config": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
- "site.storm-site.storm.zookeeper.superACL": "sasl:${USER_NAME}@EXAMPLE.COM",
+ "site.storm-site.storm.zookeeper.superACL": "sasl:${USER_NAME}",
"site.storm-site.nimbus.admins": "['${USER_NAME}']",
"site.storm-site.nimbus.users": "['${USER_NAME}']",
"site.storm-site.nimbus.supervisor.users": "['${USER_NAME}']",
[39/50] incubator-slider git commit: SLIDER-643 revert to
2.6.0-SNAPSHOT profile for jenkins
Posted by el...@apache.org.
SLIDER-643 revert to 2.6.0-SNAPSHOT profile for jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a9deb069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a9deb069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a9deb069
Branch: refs/heads/master
Commit: a9deb0691e134a5a1c88b9243937847eee6c6868
Parents: 50158dc
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 12 15:37:39 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 12 15:37:39 2014 +0000
----------------------------------------------------------------------
pom.xml | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9deb069/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a1d55c..6cf66ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
<!--
core artifacts
-->
- <hadoop.version>2.6.0</hadoop.version>
+ <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
<hbase.version>0.98.4-hadoop2</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
@@ -1405,12 +1405,18 @@
</profile>
<profile>
- <!-- local builds of everything -->
- <id>local</id>
+ <!-- 2.6 snapshots -->
+ <id>branch-2.6</id>
<properties>
<hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
- <hbase.version>0.98.5-SNAPSHOT</hbase.version>
- <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- 2.6 snapshots -->
+ <id>release-2.6</id>
+ <properties>
+ <hadoop.version>2.6.0</hadoop.version>
</properties>
</profile>
@@ -1424,13 +1430,29 @@
<profile>
<!-- hadoop trunk builds -->
- <id>hadoop-trunk</id>
+ <id>trunk</id>
<properties>
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
</properties>
</profile>
<profile>
+ <!-- Java 7 build -->
+ <id>java7</id>
+ <properties>
+ <project.java.src.version>7</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- Java 8 build -->
+ <id>java8</id>
+ <properties>
+ <project.java.src.version>8</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
<!-- anything for a jenkins build -->
<id>jenkins</id>
<properties>
[10/50] incubator-slider git commit: SLIDER-622 kill operation tested
for at class load time;
used to skip kill() operations.Tests that use the kill explicilty must then be
made to skip if not kill_supported
Posted by el...@apache.org.
SLIDER-622 kill operation tested for at class load time; used to skip kill() operations.Tests that use the kill explicilty must then be made to skip if not kill_supported
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/be5c0d71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/be5c0d71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/be5c0d71
Branch: refs/heads/master
Commit: be5c0d7190cd5cbb1f207793f89e9b9652597eba
Parents: 954b0a2
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 17:51:39 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../standalone/TestStandaloneAMKill.groovy | 4 +-
.../common/tools/TestWindowsSupport.groovy | 48 +++++-----------
.../apache/slider/test/SliderTestUtils.groovy | 38 -------------
.../slider/test/YarnMiniClusterTestBase.groovy | 60 +++++++++++++++++++-
.../providers/accumulo/AccumuloTestBase.groovy | 2 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 4 +-
6 files changed, 80 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy
index bad2715..d6b3929 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy
@@ -27,6 +27,7 @@ import org.apache.slider.client.SliderClient
import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.common.params.Arguments
import org.apache.slider.core.main.ServiceLauncher
+import org.junit.Assume
import org.junit.Test
/**
@@ -38,9 +39,9 @@ import org.junit.Test
class TestStandaloneAMKill extends AgentMiniClusterTestBase {
-
@Test
public void testKillStandaloneAM() throws Throwable {
+ Assume.assumeTrue(kill_supported)
String clustername = createMiniCluster("", configuration, 1, true)
describe "kill a Standalone AM and verify that it shuts down"
@@ -54,6 +55,7 @@ class TestStandaloneAMKill extends AgentMiniClusterTestBase {
SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ApplicationReport report = waitForClusterLive(sliderClient)
+ assert report.yarnApplicationState == YarnApplicationState.RUNNING
describe("listing Java processes")
lsJavaProcesses();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 25b7c57..9b383f4 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -28,15 +28,15 @@ import org.apache.hadoop.fs.FileSystem as HadoopFS
import org.apache.hadoop.service.ServiceStateException
import org.apache.hadoop.util.Shell
import org.apache.slider.providers.agent.AgentUtils
-import org.apache.slider.server.services.workflow.ForkedProcessService
import org.apache.slider.test.SliderTestBase
+import org.apache.slider.test.YarnMiniClusterTestBase
import org.junit.Test
import java.util.regex.Pattern
@CompileStatic
@Slf4j
-class TestWindowsSupport extends SliderTestBase {
+class TestWindowsSupport extends YarnMiniClusterTestBase {
private static final Pattern hasDriveLetterSpecifier =
Pattern.compile("^/?[a-zA-Z]:");
@@ -121,18 +121,28 @@ class TestWindowsSupport extends SliderTestBase {
@Test
public void testExecNonexistentBinary() throws Throwable {
assume(Shell.WINDOWS, "not windows")
+ def commands = ["undefined-application", "--version"]
try {
- exec(2, ["undefined-application", "--version"])
+ exec(0, commands)
+ fail("expected an exception")
} catch (ServiceStateException e) {
if (!(e.cause instanceof FileNotFoundException)) {
throw e;
}
}
}
+ @Test
+ public void testExecNonexistentBinary2() throws Throwable {
+ assume(Shell.WINDOWS, "not windows")
+ assert !doesWindowsAppExist(["undefined-application", "--version"])
+ }
@Test
public void testEmitKillCommand() throws Throwable {
- killJavaProcesses("regionserver", 9)
+
+ def result = killJavaProcesses("regionserver", 9)
+ // we know the exit code if there is no supported kill operation
+ assert kill_supported || result == -1
}
@Test
@@ -159,34 +169,4 @@ class TestWindowsSupport extends SliderTestBase {
exec(0, [winUtilsPath, "systeminfo"])
}
-
- /**
- * Exec a set of commands, wait a few seconds for it to finish.
- * @param status code
- * @param commands
- * @return the process
- */
- public ForkedProcessService exec(int status, List<String> commands) {
- ForkedProcessService process = exec(commands)
- assert status == process.exitCode
- return process
- }
-
- /**
- * Exec a set of commands, wait a few seconds for it to finish.
- * @param commands
- * @return
- */
-
- public ForkedProcessService exec(List<String> commands) {
- ForkedProcessService process;
- process = new ForkedProcessService(
- methodName.methodName,
- [:],
- commands);
- process.init(new Configuration());
- process.start();
- process.waitForServiceToStop(10000);
- process
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index 8d6c036..ad18c72 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -925,44 +925,6 @@ class SliderTestUtils extends Assert {
}
/**
- * Kill any java process with the given grep pattern
- * @param grepString string to grep for
- */
- public int killJavaProcesses(String grepString, int signal) {
-
- def commandString
- if (!Shell.WINDOWS) {
- GString killCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | xargs kill $signal"
- log.info("Command command = $killCommand")
-
- commandString = ["bash", "-c", killCommand]
- } else {
- /*
- "jps -l | grep "String" | awk "{print $1}" | xargs -n 1 taskkill /PID"
- */
- GString killCommand = "\"jps -l | grep \"${grepString}\" | gawk \"{print \$1}\" | xargs -n 1 taskkill /f /PID\""
- commandString = ["CMD", "/C", killCommand]
- }
- Process command = commandString.execute()
- def exitCode = command.waitFor()
-
- log.info(command.in.text)
- log.error(command.err.text)
- return exitCode
- }
-
- /**
- * Kill all processes which match one of the list of grepstrings
- * @param greps
- * @param signal
- */
- public void killJavaProcesses(List<String> greps, int signal) {
- for (String grep : greps) {
- killJavaProcesses(grep, signal)
- }
- }
-
- /**
* Convert a file to a URI suitable for use in an argument
* @param file file
* @return a URI string valid on all platforms
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index 73b81ab..88fac06 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FileUtil
import org.apache.hadoop.fs.Path
import org.apache.hadoop.hdfs.MiniDFSCluster
import org.apache.hadoop.service.ServiceOperations
+import org.apache.hadoop.util.Shell
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.hadoop.yarn.conf.YarnConfiguration
@@ -83,6 +84,9 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
public static final YarnConfiguration SLIDER_CONFIG = SliderUtils.createConfiguration();
+
+ public static boolean kill_supported;
+
static {
SLIDER_CONFIG.setInt(SliderXmlConfKeys.KEY_AM_RESTART_LIMIT, 1)
SLIDER_CONFIG.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, 100)
@@ -91,7 +95,6 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
SLIDER_CONFIG.setBoolean(SliderXmlConfKeys.KEY_SLIDER_AM_DEPENDENCY_CHECKS_DISABLED,
true)
SLIDER_CONFIG.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 1)
-
}
@@ -194,6 +197,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
protected void addToTeardown(SliderClient client) {
clustersToTeardown << client;
}
+
protected void addToTeardown(ServiceLauncher<SliderClient> launcher) {
SliderClient sliderClient = launcher?.service
if (sliderClient) {
@@ -201,6 +205,60 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
}
}
+ /**
+ * Work out if kill is supported
+ */
+ @BeforeClass
+ public static void checkKillSupport() {
+ if (!Shell.WINDOWS) {
+ kill_supported = true;
+ } else {
+ kill_supported = doesWindowsAppExist(["xargs", "--version"])
+ }
+ }
+
+ /**
+ * Kill any java process with the given grep pattern
+ * @param grepString string to grep for
+ */
+ public int killJavaProcesses(String grepString, int signal) {
+
+ def commandString
+ if (!Shell.WINDOWS) {
+ GString killCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | xargs kill $signal"
+ log.info("Command command = $killCommand")
+
+ commandString = ["bash", "-c", killCommand]
+ } else {
+ // windows
+ if (!kill_supported) {
+ return -1;
+ }
+
+ /*
+ "jps -l | grep "String" | awk "{print $1}" | xargs -n 1 taskkill /PID"
+ */
+ GString killCommand = "\"jps -l | grep \"${grepString}\" | gawk \"{print \$1}\" | xargs -n 1 taskkill /f /PID\""
+ commandString = ["CMD", "/C", killCommand]
+ }
+ Process command = commandString.execute()
+ def exitCode = command.waitFor()
+
+ log.info(command.in.text)
+ log.error(command.err.text)
+ return exitCode
+ }
+
+ /**
+ * Kill all processes which match one of the list of grepstrings
+ * @param greps
+ * @param signal
+ */
+ public void killJavaProcesses(List<String> greps, int signal) {
+ for (String grep : greps) {
+ killJavaProcesses(grep, signal)
+ }
+ }
protected YarnConfiguration getConfiguration() {
return SLIDER_CONFIG;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
index 3c5606b..2a87cf0 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
@@ -71,7 +71,7 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase {
@Override
void teardown() {
super.teardown();
- if (teardownKillall) {
+ if (teardownKillall && kill_supported) {
try {
killAllAccumuloProcesses();
} catch (AssumptionViolatedException e) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be5c0d71/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
index 3d0c03f..fcb73e0 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
@@ -87,7 +87,9 @@ class TestAccFreezeThaw extends AccumuloTestBase {
log.debug("expected exception", expected)
}
//force kill any accumulo processes
- killAllAccumuloProcesses()
+ if (kill_supported) {
+ killAllAccumuloProcesses()
+ }
sleepForAccumuloClusterLive();
[43/50] incubator-slider git commit: SLIDER-647 allocation requests
not being satisfied when a cluster goes to labels
Posted by el...@apache.org.
SLIDER-647 allocation requests not being satisfied when a cluster goes to labels
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c7186e13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c7186e13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c7186e13
Branch: refs/heads/master
Commit: c7186e13ddd2c1e45e4faf84119b5bb2d04fd00e
Parents: 0cb6eaf
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 13 22:35:32 2014 +0000
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 18:19:30 2014 -0800
----------------------------------------------------------------------
.../slider/providers/PlacementPolicy.java | 22 ++-
.../slider/server/appmaster/state/AppState.java | 22 ++-
.../appmaster/state/OutstandingRequest.java | 2 +-
.../server/appmaster/state/RoleHistory.java | 6 +-
.../server/appmaster/state/RoleStatus.java | 4 +
.../TestMockAppStateDynamicHistory.groovy | 3 +-
.../TestMockAppStateDynamicRoles.groovy | 172 ++++++++++++++++++-
.../TestMockAppStateRolePlacement.groovy | 5 +
.../model/mock/BaseMockAppStateTest.groovy | 2 +
.../appmaster/model/mock/MockYarnCluster.groovy | 10 +-
.../appmaster/model/mock/MockYarnEngine.groovy | 6 +
11 files changed, 229 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java b/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java
index 444c041..dc6c910 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java
@@ -23,9 +23,29 @@ package org.apache.slider.providers;
*/
public class PlacementPolicy {
+ /**
+ * Default values
+ */
public static final int DEFAULT = 0;
- public static final int EXCLUDE_FROM_FLEXING = 1;
+
+ /**
+ * Strict placement: when asking for an instance for which there is
+ * history, mandate that it is strict
+ */
+ public static final int STRICT = 1;
+
+ /**
+ * No data locality; do not bother trying to ask for any location
+ */
public static final int NO_DATA_LOCALITY = 2;
+ /**
+ * Anti-affinity is mandatory.
+ */
public static final int ANTI_AFFINITY_REQUIRED = 4;
+
+ /**
+ * Exclude from flexing; used internally to mark AMs.
+ */
+ public static final int EXCLUDE_FROM_FLEXING = 16;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
index 0848173..9956db2 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
@@ -58,6 +58,7 @@ import org.apache.slider.core.exceptions.ErrorStrings;
import org.apache.slider.core.exceptions.NoSuchNodeException;
import org.apache.slider.core.exceptions.SliderInternalStateException;
import org.apache.slider.core.exceptions.TriggerClusterTeardownException;
+import org.apache.slider.providers.PlacementPolicy;
import org.apache.slider.providers.ProviderRole;
import org.apache.slider.server.appmaster.operations.AbstractRMOperation;
import org.apache.slider.server.appmaster.operations.CancelRequestOperation;
@@ -582,13 +583,15 @@ public class AppState {
int priority = SliderUtils.parseAndValidate("value of " + name + " " +
ResourceKeys.COMPONENT_PRIORITY,
priOpt, 0, 1, -1);
- log.info("Role {} assigned priority {}", name, priority);
String placementOpt = component.getOption(
- ResourceKeys.COMPONENT_PLACEMENT_POLICY, "0");
+ ResourceKeys.COMPONENT_PLACEMENT_POLICY,
+ Integer.toString(PlacementPolicy.DEFAULT));
int placement = SliderUtils.parseAndValidate("value of " + name + " " +
ResourceKeys.COMPONENT_PLACEMENT_POLICY,
placementOpt, 0, 0, -1);
- return new ProviderRole(name, priority, placement);
+ ProviderRole newRole = new ProviderRole(name, priority, placement);
+ log.info("New {} ", newRole);
+ return newRole;
}
@@ -998,17 +1001,17 @@ public class AppState {
/**
- * enum nodes by role ID, from either the active or live node list
+ * enum nodes by role ID, from either the owned or live node list
* @param roleId role the container must be in
- * @param active flag to indicate "use active list" rather than the smaller
+ * @param owned flag to indicate "use owned list" rather than the smaller
* "live" list
* @return a list of nodes, may be empty
*/
public synchronized List<RoleInstance> enumNodesWithRoleId(int roleId,
- boolean active) {
+ boolean owned) {
List<RoleInstance> nodes = new ArrayList<RoleInstance>();
Collection<RoleInstance> allRoleInstances;
- allRoleInstances = active ? ownedContainers.values() : liveNodes.values();
+ allRoleInstances = owned ? ownedContainers.values() : liveNodes.values();
for (RoleInstance node : allRoleInstances) {
if (node.roleId == roleId) {
nodes.add(node);
@@ -1746,6 +1749,9 @@ public class AppState {
// enum all active nodes that aren't being released
List<RoleInstance> containersToRelease = enumNodesWithRoleId(roleId, true);
+ if (containersToRelease.isEmpty()) {
+ log.info("No containers for component {}", roleId);
+ }
// cut all release-in-progress nodes
ListIterator<RoleInstance> li = containersToRelease.listIterator();
@@ -1759,7 +1765,7 @@ public class AppState {
// warn if the desired state can't be reaced
int numberAvailableForRelease = containersToRelease.size();
if (numberAvailableForRelease < excess) {
- log.warn("Not enough nodes to release, have {} and need {} more",
+ log.warn("Not enough containers to release, have {} and need {} more",
numberAvailableForRelease,
excess - numberAvailableForRelease);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
index 4a05a1a..d6022e0 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
@@ -108,7 +108,7 @@ public final class OutstandingRequest {
if (node != null) {
hosts = new String[1];
hosts[0] = node.hostname;
- relaxLocality = false;
+ relaxLocality = !role.isStrictPlacement();
// tell the node it is in play
node.getOrCreate(roleId);
log.info("Submitting request for container on {}", hosts[0]);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
index 8de4b92..ce2ab0a 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
@@ -750,11 +750,7 @@ public class RoleHistory {
available = false;
} else {
available = nodeEntry.containerCompleted(wasReleased);
- boolean isFailedNode = failedNodes.contains(RoleHistoryUtils
- .hostnameOf(container));
- if (!isFailedNode) {
- maybeQueueNodeForWork(container, nodeEntry, available);
- }
+ maybeQueueNodeForWork(container, nodeEntry, available);
}
touch();
return available;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java
index 734bbea..3c860d6 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java
@@ -100,6 +100,10 @@ public final class RoleStatus implements Cloneable {
public boolean getNoDataLocality() {
return 0 != (getPlacementPolicy() & PlacementPolicy.NO_DATA_LOCALITY);
}
+
+ public boolean isStrictPlacement() {
+ return 0 != (getPlacementPolicy() & PlacementPolicy.STRICT);
+ }
public synchronized int getDesired() {
return desired;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicHistory.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicHistory.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicHistory.groovy
index e06c2cb..aa7bb11 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicHistory.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicHistory.groovy
@@ -25,6 +25,7 @@ import org.apache.hadoop.yarn.api.records.ContainerId
import org.apache.slider.api.ResourceKeys
import org.apache.slider.core.conf.ConfTreeOperations
import org.apache.slider.core.exceptions.BadConfigException
+import org.apache.slider.providers.PlacementPolicy
import org.apache.slider.providers.ProviderRole
import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest
import org.apache.slider.server.appmaster.model.mock.MockAppState
@@ -87,7 +88,7 @@ class TestMockAppStateDynamicHistory extends BaseMockAppStateTest
def dynamic = "dynamicRole"
int role_priority_8 = 8
int desired = 1
- int placementPolicy = 0
+ int placementPolicy = PlacementPolicy.DEFAULT
// snapshot and patch existing spec
def resources = ConfTreeOperations.fromInstance(
appState.resourcesSnapshot.confTree)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy
index 902752c..83fb273 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy
@@ -21,13 +21,18 @@ package org.apache.slider.server.appmaster.model.appstate
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.yarn.api.records.ContainerId
import org.apache.slider.api.ResourceKeys
-import org.apache.slider.common.tools.SliderUtils
-import org.apache.slider.core.conf.ConfTreeOperations
+import org.apache.slider.providers.PlacementPolicy
import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest
import org.apache.slider.server.appmaster.model.mock.MockAppState
import org.apache.slider.server.appmaster.model.mock.MockRoles
import org.apache.slider.server.appmaster.model.mock.MockYarnEngine
+import org.apache.slider.server.appmaster.operations.AbstractRMOperation
+import org.apache.slider.server.appmaster.operations.ContainerRequestOperation
+import org.apache.slider.server.appmaster.state.AppState
+import org.apache.slider.server.appmaster.state.ContainerPriority
+import org.apache.slider.server.appmaster.state.RoleHistoryUtils
import org.apache.slider.server.appmaster.state.RoleInstance
import org.apache.slider.server.appmaster.state.SimpleReleaseSelector
import org.junit.Test
@@ -39,6 +44,10 @@ import org.junit.Test
@Slf4j
class TestMockAppStateDynamicRoles extends BaseMockAppStateTest
implements MockRoles {
+ private static final String ROLE4 = "4"
+ private static final String ROLE5 = "5"
+ private static final int ID4 = 4
+ private static final int ID5 = 5
@Override
String getTestName() {
@@ -52,7 +61,7 @@ class TestMockAppStateDynamicRoles extends BaseMockAppStateTest
*/
@Override
MockYarnEngine createYarnEngine() {
- return new MockYarnEngine(4, 4)
+ return new MockYarnEngine(8, 2)
}
@Override
@@ -60,17 +69,25 @@ class TestMockAppStateDynamicRoles extends BaseMockAppStateTest
super.initApp()
appState = new MockAppState()
appState.setContainerLimits(RM_MAX_RAM, RM_MAX_CORES)
-
def instance = factory.newInstanceDefinition(0,0,0)
def opts = [
+ (ResourceKeys.COMPONENT_PRIORITY): ROLE4,
(ResourceKeys.COMPONENT_INSTANCES): "1",
- (ResourceKeys.COMPONENT_PRIORITY): "4",
]
- instance.resourceOperations.components["dynamic"]= opts
-
-
+
+ instance.resourceOperations.components[ROLE4]= opts
+
+ def opts5 = [
+ (ResourceKeys.COMPONENT_PRIORITY) : ROLE5,
+ (ResourceKeys.COMPONENT_INSTANCES): "1",
+ (ResourceKeys.COMPONENT_PLACEMENT_POLICY):
+ Integer.toString(PlacementPolicy.STRICT),
+ ]
+
+ instance.resourceOperations.components[ROLE5]= opts5
+
appState.buildInstance(
instance,
new Configuration(),
@@ -88,7 +105,146 @@ class TestMockAppStateDynamicRoles extends BaseMockAppStateTest
createAndStartNodes()
appState.reviewRequestAndReleaseNodes()
appState.getRoleHistory().dump();
+ }
+
+ /**
+ * Find all allocations for a specific role
+ * @param role role Id/priority
+ * @param actions source list
+ * @return found list
+ */
+ List<ContainerRequestOperation> findAllocationsForRole(int role,
+ List<AbstractRMOperation> actions) {
+ List <ContainerRequestOperation > results = []
+ actions.each { AbstractRMOperation operation ->
+ if (operation instanceof ContainerRequestOperation) {
+ def req = (ContainerRequestOperation) operation;
+ def reqrole = ContainerPriority.extractRole(req.request.priority)
+ if (role == reqrole) {
+ results << req
+ }
+ }
+ }
+ return results
+ }
+
+ @Test
+ public void testStrictPlacementInitialRequest() throws Throwable {
+ log.info("Initial engine state = $engine")
+ List<AbstractRMOperation> actions = appState.reviewRequestAndReleaseNodes()
+ assert actions.size() == 2
+
+ // neither have locality at this point
+ assertRelaxLocalityFlag(ID4, null, true, actions)
+ assertRelaxLocalityFlag(ID5, null, true, actions)
+ }
+
+
+ @Test
+ public void testPolicyPropagation() throws Throwable {
+ assert !(appState.lookupRoleStatus(ROLE4).placementPolicy & PlacementPolicy.STRICT)
+ assert (appState.lookupRoleStatus(ROLE5).placementPolicy & PlacementPolicy.STRICT)
+
+ }
+
+ @Test
+ public void testLaxPlacementSecondRequestRole4() throws Throwable {
+ log.info("Initial engine state = $engine")
+ def role4 = appState.lookupRoleStatus(ROLE4)
+ def role5 = appState.lookupRoleStatus(ROLE5)
+ role4.desired = 1
+ role5.desired = 0
+
+ def instances = createStartAndStopNodes([])
+ assert instances.size() == 1
+
+ def instanceA = instances.find { RoleInstance instance ->
+ instance.roleId = ID4
+ }
+ assert instanceA
+ def hostname = RoleHistoryUtils.hostnameOf(instanceA.container)
+
+
+ log.info("Allocated engine state = $engine")
+ assert engine.containerCount() == 1
+
+ assert role4.actual == 1
+ // shrinking cluster
+
+ role4.desired = 0
+ appState.lookupRoleStatus(ROLE4).desired = 0
+ def completionResults = []
+ def containersToRelease = []
+ instances = createStartAndStopNodes(completionResults)
+ assert engine.containerCount() == 0
+ assert completionResults.size() == 1
+
+ // expanding: expect hostnames now
+ role4.desired = 1
+ def actions = appState.reviewRequestAndReleaseNodes()
+ assert actions.size() == 1
+
+ assertRelaxLocalityFlag(ID4, "", true, actions)
+ ContainerRequestOperation cro = (ContainerRequestOperation) actions[0]
+ def nodes = cro.request.nodes
+ assert nodes.size() == 1
+ assert hostname == nodes[0]
+ }
+
+ @Test
+ public void testStrictPlacementSecondRequestRole5() throws Throwable {
+ log.info("Initial engine state = $engine")
+ def role4 = appState.lookupRoleStatus(ROLE4)
+ def role5 = appState.lookupRoleStatus(ROLE5)
+ role4.desired = 0
+ role5.desired = 1
+
+ def instances = createStartAndStopNodes([])
+ assert instances.size() == 1
+
+ def instanceA = instances.find { RoleInstance instance ->
+ instance.roleId = ID5
+ }
+ assert instanceA
+ def hostname = RoleHistoryUtils.hostnameOf(instanceA.container)
+
+
+ log.info("Allocated engine state = $engine")
+ assert engine.containerCount() == 1
+
+ assert role5.actual == 1
+ // shrinking cluster
+
+ role5.desired = 0
+ def completionResults = []
+ def containersToRelease = []
+ instances = createStartAndStopNodes(completionResults)
+ assert engine.containerCount() == 0
+ assert completionResults.size() == 1
+ assert role5.actual == 0
+
+ role5.desired = 1
+ def actions = appState.reviewRequestAndReleaseNodes()
+ assert actions.size() == 1
+ assertRelaxLocalityFlag(ID5, "", false, actions)
+ ContainerRequestOperation cro = (ContainerRequestOperation) actions[0]
+ def nodes = cro.request.nodes
+ assert nodes.size() == 1
+ assert hostname == nodes[0]
+
+ }
+
+ public void assertRelaxLocalityFlag(
+ int id,
+ String expectedHost,
+ boolean expectedRelaxFlag,
+ List<AbstractRMOperation> actions) {
+ def requests
+ requests = findAllocationsForRole(id, actions)
+ assert requests.size() == 1
+ def req = requests[0]
+ assert expectedRelaxFlag == req.request.relaxLocality
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRolePlacement.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRolePlacement.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRolePlacement.groovy
index 6df8910..e9de390 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRolePlacement.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRolePlacement.groovy
@@ -56,6 +56,10 @@ class TestMockAppStateRolePlacement extends BaseMockAppStateTest
List<AbstractRMOperation> ops = appState.reviewRequestAndReleaseNodes()
ContainerRequestOperation operation = (ContainerRequestOperation) ops[0]
AMRMClient.ContainerRequest request = operation.request
+ assert request.relaxLocality
+ assert request.nodes == null
+ assert request.racks == null
+
Container allocated = engine.allocateContainer(request)
List<ContainerAssignment> assignments = [];
List<AbstractRMOperation> operations = []
@@ -97,6 +101,7 @@ class TestMockAppStateRolePlacement extends BaseMockAppStateTest
AMRMClient.ContainerRequest request2 = operation.request
assert request2 != null
assert request2.nodes[0] == containerHostname
+ assert request2.relaxLocality
engine.execute(ops)
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.groovy
index 50d7e06..6c83c55 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.groovy
@@ -223,6 +223,7 @@ abstract class BaseMockAppStateTest extends SliderTestBase implements MockRoles
List<AppState.NodeCompletionResult> completionResults,
List<ContainerId> released) {
for (RoleInstance instance : instances) {
+ log.debug("Started ${instance.role} on ${instance.id} ")
assert appState.onNodeManagerContainerStarted(instance.containerId)
}
releaseContainers(completionResults,
@@ -297,6 +298,7 @@ abstract class BaseMockAppStateTest extends SliderTestBase implements MockRoles
RoleInstance ri = roleInstance(assigned)
instances << ri
//tell the app it arrived
+ log.debug("Start submitted ${ri.role} on ${container.id} ")
appState.containerStartSubmitted(container, ri);
}
return instances
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnCluster.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnCluster.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnCluster.groovy
index fe06d7c..6056e3a 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnCluster.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnCluster.groovy
@@ -56,6 +56,12 @@ public class MockYarnCluster {
build();
}
+ @Override
+ String toString() {
+ return "MockYarnCluster size=$clusterSize, capacity=${totalClusterCapacity()},"+
+ " in use=${containersInUse()}"
+ }
+
/**
* Build the cluster.
*/
@@ -90,7 +96,9 @@ public class MockYarnCluster {
*/
MockYarnClusterContainer release(ContainerId cid) {
int host = extractHost(cid.id)
- return nodeAt(host).release(cid.id)
+ def inUse = nodeAt(host).release(cid.id)
+ log.debug("Released $cid inuse=$inUse")
+ return inUse
}
int containersInUse() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7186e13/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnEngine.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnEngine.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnEngine.groovy
index f405188..04466c6 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnEngine.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockYarnEngine.groovy
@@ -50,6 +50,11 @@ class MockYarnEngine {
attemptId: 1,
)
+ @Override
+ String toString() {
+ return "MockYarnEngine $cluster + pending=${pending.size()}"
+ }
+
int containerCount() {
return cluster.containersInUse();
}
@@ -109,6 +114,7 @@ class MockYarnEngine {
} else {
ContainerRequestOperation req = (ContainerRequestOperation) op
Container container = allocateContainer(req.request)
+ log.info("allocated container $container for $req")
if (container != null) {
allocation.add(container)
} else {
[27/50] incubator-slider git commit: SLIDER-622 warn if the directory
is still present after the delete (shutdown race condition problem on NTFS)
Posted by el...@apache.org.
SLIDER-622 warn if the directory is still present after the delete (shutdown race condition problem on NTFS)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d5569711
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d5569711
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d5569711
Branch: refs/heads/master
Commit: d5569711eddcd1d4804a8afb42709a5b78f5daee
Parents: b88c775
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 12:58:24 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:28 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/slider/client/SliderClient.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d5569711/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index a676fcc..164e2fe 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -23,6 +23,7 @@ import com.google.common.base.Preconditions;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathNotFoundException;
import org.apache.hadoop.fs.permission.FsAction;
@@ -536,24 +537,23 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
// create the directory path
Path clusterDirectory = sliderFileSystem.buildClusterDirPath(clustername);
// delete the directory;
- boolean exists = sliderFileSystem.getFileSystem().exists(clusterDirectory);
+ FileSystem fs = sliderFileSystem.getFileSystem();
+ boolean exists = fs.exists(clusterDirectory);
if (exists) {
log.debug("Application Instance {} found at {}: destroying", clustername, clusterDirectory);
boolean deleted =
- sliderFileSystem.getFileSystem().delete(clusterDirectory, true);
+ fs.delete(clusterDirectory, true);
if (!deleted) {
log.warn("Filesystem returned false from delete() operation");
}
-
- if(!deleteZookeeperNode(clustername)) {
- log.warn("Unable to perform node cleanup in Zookeeper.");
+ if (fs.exists(clusterDirectory)) {
+ log.warn("Failed to delete {}", clusterDirectory);
}
} else {
log.debug("Application Instance {} already destroyed", clustername);
}
-
// rm the registry entry —do not let this block the destroy operations
String registryPath = SliderRegistryUtils.registryPathForInstance(
clustername);
[25/50] incubator-slider git commit: SLIDER-630 python path specified
via slider-client.xml or app config global prop
Posted by el...@apache.org.
SLIDER-630 python path specified via slider-client.xml or app config global prop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e04c51b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e04c51b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e04c51b0
Branch: refs/heads/master
Commit: e04c51b0e1539c0dd1f66ba79536a7ab68f62ab7
Parents: 71a8559
Author: Jon Maron <jm...@hortonworks.com>
Authored: Mon Nov 10 21:38:28 2014 -0500
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Tue Nov 11 06:39:32 2014 -0500
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 19 +++++++++++++++++--
.../apache/slider/common/SliderXmlConfKeys.java | 5 +++++
.../providers/agent/AgentProviderService.java | 6 +++++-
3 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e04c51b0/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 99c4746..a676fcc 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -68,6 +68,7 @@ import org.apache.slider.api.proto.Messages;
import org.apache.slider.common.Constants;
import org.apache.slider.common.SliderExitCodes;
import org.apache.slider.common.SliderKeys;
+import org.apache.slider.common.SliderXmlConfKeys;
import org.apache.slider.common.params.AbstractActionArgs;
import org.apache.slider.common.params.AbstractClusterBuildingActionArgs;
import org.apache.slider.common.params.ActionDiagnosticArgs;
@@ -905,6 +906,8 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
appConf.set(AgentKeys.PACKAGE_PATH, buildInfo.packageURI);
}
+ propagatePythonExecutable(conf, instanceDefinition);
+
// make any substitutions needed at this stage
replaceTokens(appConf.getConfTree(), getUsername(), clustername);
@@ -1213,6 +1216,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
propagatePrincipals(config, instanceDefinition);
// validate security data
+
/*
// turned off until tested
SecurityConfiguration securityConfiguration =
@@ -1401,8 +1405,19 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
LaunchedApplication launchedApplication = amLauncher.submitApplication();
return launchedApplication;
}
-
-
+
+ private void propagatePythonExecutable(Configuration config,
+ AggregateConf instanceDefinition) {
+ String pythonExec = config.get(
+ SliderXmlConfKeys.PYTHON_EXECUTABLE_PATH);
+ if (pythonExec != null) {
+ instanceDefinition.getAppConfOperations().getGlobalOptions().putIfUnset(
+ SliderXmlConfKeys.PYTHON_EXECUTABLE_PATH,
+ pythonExec);
+ }
+ }
+
+
/**
* Wait for the launched app to be accepted in the time
* and, optionally running.
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e04c51b0/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
index e7f8ce5..a967ebf 100644
--- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
@@ -156,4 +156,9 @@ public interface SliderXmlConfKeys {
*/
String KEY_SLIDER_AM_DEPENDENCY_CHECKS_DISABLED =
"slider.am.dependency.checks.disabled";
+
+ /**
+ * The path to the python executable utilized to launch the agent.
+ */
+ String PYTHON_EXECUTABLE_PATH = "agent.python.exec.path";
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e04c51b0/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index c86eabd..4f981c7 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -402,7 +402,11 @@ public class AgentProviderService extends AbstractProviderService implements
String label = getContainerLabel(container, role);
CommandLineBuilder operation = new CommandLineBuilder();
- operation.add(AgentKeys.PYTHON_EXE);
+ String pythonExec = instanceDefinition.getAppConfOperations()
+ .getGlobalOptions().getOption(SliderXmlConfKeys.PYTHON_EXECUTABLE_PATH,
+ AgentKeys.PYTHON_EXE);
+
+ operation.add(pythonExec);
operation.add(scriptPath);
operation.add(ARG_LABEL, label);
[49/50] incubator-slider git commit: Revert "SLIDER-398. memcached
package is broken"
Posted by el...@apache.org.
Revert "SLIDER-398. memcached package is broken"
This reverts commit 8434b8971af93fe316e4b4c9f6d4a2a917caedd0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/08ffa87e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/08ffa87e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/08ffa87e
Branch: refs/heads/master
Commit: 08ffa87e64091ead7de83df381ca3214821dfc43
Parents: 8434b89
Author: Josh Elser <el...@apache.org>
Authored: Sat Nov 22 17:01:40 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sat Nov 22 17:01:40 2014 -0500
----------------------------------------------------------------------
app-packages/app-pkg-template/metainfo.xml | 8 ++++----
app-packages/memcached-win/metainfo.xml | 8 ++++----
app-packages/memcached/metainfo.xml | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/08ffa87e/app-packages/app-pkg-template/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/app-pkg-template/metainfo.xml b/app-packages/app-pkg-template/metainfo.xml
index 50c0fbd..c6e1485 100644
--- a/app-packages/app-pkg-template/metainfo.xml
+++ b/app-packages/app-pkg-template/metainfo.xml
@@ -28,12 +28,12 @@
<component>
<name>MYAPP_COMPONENT</name>
<category>MASTER</category>
- <componentExports>
- <componentExport>
+ <exports>
+ <export>
<name>host_port</name>
<value>${THIS_HOST}:${site.global.listen_port}</value>
- </componentExport>
- </componentExports>
+ </export>
+ </exports>
<commandScript>
<script>scripts/myapp_component.py</script>
<scriptType>PYTHON</scriptType>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/08ffa87e/app-packages/memcached-win/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/memcached-win/metainfo.xml b/app-packages/memcached-win/metainfo.xml
index c7e5881..d056c0a 100644
--- a/app-packages/memcached-win/metainfo.xml
+++ b/app-packages/memcached-win/metainfo.xml
@@ -28,12 +28,12 @@
<component>
<name>MEMCACHED</name>
<category>MASTER</category>
- <componentExports>
- <componentExport>
+ <exports>
+ <export>
<name>host_port</name>
<value>${THIS_HOST}:${site.global.listen_port}</value>
- </componentExport>
- </componentExports>
+ </export>
+ </exports>
<commandScript>
<script>scripts/memcached.py</script>
<scriptType>PYTHON</scriptType>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/08ffa87e/app-packages/memcached/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/memcached/metainfo.xml b/app-packages/memcached/metainfo.xml
index 5801ad2..525816e 100644
--- a/app-packages/memcached/metainfo.xml
+++ b/app-packages/memcached/metainfo.xml
@@ -28,12 +28,12 @@
<component>
<name>MEMCACHED</name>
<category>MASTER</category>
- <componentExports>
- <componentExport>
+ <exports>
+ <export>
<name>host_port</name>
<value>${THIS_HOST}:${site.global.listen_port}</value>
- </componentExport>
- </componentExports>
+ </export>
+ </exports>
<commandScript>
<script>scripts/memcached.py</script>
<scriptType>PYTHON</scriptType>
[11/50] incubator-slider git commit: SLIDER-622 scanning for the DLL
on the path
Posted by el...@apache.org.
SLIDER-622 scanning for the DLL on the path
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d1c567fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d1c567fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d1c567fe
Branch: refs/heads/master
Commit: d1c567fe4f47b539fe25aaa7ebfc13b8ff071751
Parents: 47473aa
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 20:38:30 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../common/tools/TestWindowsSupport.groovy | 64 +++++++++++++++-----
1 file changed, 50 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d1c567fe/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index cbd79a4..769233e 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -28,7 +28,6 @@ import org.apache.hadoop.fs.FileSystem as HadoopFS
import org.apache.hadoop.service.ServiceStateException
import org.apache.hadoop.util.Shell
import org.apache.slider.providers.agent.AgentUtils
-import org.apache.slider.test.SliderTestBase
import org.apache.slider.test.YarnMiniClusterTestBase
import org.junit.Test
@@ -68,8 +67,8 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
@Test
public void testPathHandling() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
-
+ assumeWindows()
+
Path path = new Path(windowsFile);
def uri = path.toUri()
// assert "file" == uri.scheme
@@ -95,14 +94,13 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
@Test
public void testSliderFS() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
+ assumeWindows()
SliderFileSystem sfs = new SliderFileSystem(new Configuration())
try {
def metainfo = AgentUtils.getApplicationMetainfo(sfs, windowsFile)
} catch (FileNotFoundException fnfe) {
// expected
}
-
}
@@ -133,10 +131,14 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
}
@Test
public void testExecNonexistentBinary2() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
+ assumeWindows()
assert !doesWindowsAppExist(["undefined-application", "--version"])
}
+ public assumeWindows() {
+ assume(Shell.WINDOWS, "not windows")
+ }
+
@Test
public void testEmitKillCommand() throws Throwable {
@@ -147,20 +149,20 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
@Test
public void testHadoopHomeDefined() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
+ assumeWindows()
def hadoopHome = Shell.hadoopHome
log.info("HADOOP_HOME=$hadoopHome")
}
@Test
public void testHasWinutils() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
+ assumeWindows()
SliderUtils.maybeVerifyWinUtilsValid()
}
@Test
public void testExecWinutils() throws Throwable {
- assume(Shell.WINDOWS, "not windows")
+ assumeWindows()
def winUtilsPath = Shell.winUtilsPath
assert winUtilsPath
File winUtils = new File(winUtilsPath)
@@ -169,11 +171,45 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
exec(0, [winUtilsPath, "systeminfo"])
}
-
@Test
public void testPath() throws Throwable {
- String pathkey;
-
+ String path = extractPath()
+ log.info("Path value = $path")
+ }
+
+ @Test
+ public void testFindJavac() throws Throwable {
+ String name = Shell.WINDOWS ? "javac.exe" : "javac"
+ assert locateExecutable(name)
+ }
+
+ @Test
+ public void testHadoopDLL() throws Throwable {
+ assumeWindows()
+ // split the path
+ File exepath = locateExecutable("HADOOP.DLL")
+ assert exepath
+ log.info "Hadoop DLL at: $exepath"
+ }
+
+ public File locateExecutable(String exe) {
+ File exepath = null
+ String path = extractPath()
+ String[] dirs = path.split(System.getProperty("path.separator"));
+ dirs.each { String dirname ->
+ File dir = new File(dirname)
+
+ File possible = new File(dir, exe)
+ if (possible.exists()) {
+ exepath = possible
+ }
+ }
+ return exepath
+ }
+
+ public String extractPath() {
+ String pathkey = "";
+
System.getenv().keySet().each { String it ->
if (it.toLowerCase(Locale.ENGLISH).equals("path")) {
pathkey = it;
@@ -181,7 +217,7 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
}
assert pathkey
log.info("Path env variable is $pathkey")
- def pathval = System.getenv(pathkey)
- log.info("Path value = $pathval")
+ def path = System.getenv(pathkey)
+ return path
}
}
[37/50] incubator-slider git commit: SLIDER-544 Release Slider 0.6.0
- fix versions so that site command builds
Posted by el...@apache.org.
SLIDER-544 Release Slider 0.6.0 - fix versions so that site command builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4bb804a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4bb804a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4bb804a2
Branch: refs/heads/master
Commit: 4bb804a2e4bcdad73015fd5c9e1d9f4dc2499d7c
Parents: d1441e3
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 20:27:39 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 20:27:39 2014 +0000
----------------------------------------------------------------------
app-packages/hbase/pom.xml | 1 -
app-packages/storm/pom.xml | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4bb804a2/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 44b2ca7..1c7fba6 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -28,7 +28,6 @@
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
<description>Slider HBase App Package</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4bb804a2/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 4e24a8d..c9418e6 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -28,7 +28,6 @@
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
<description>Slider Storm App Package</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
</properties>
[34/50] incubator-slider git commit: SLIDER-639 workarounds for
windows
Posted by el...@apache.org.
SLIDER-639 workarounds for windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/010127ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/010127ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/010127ab
Branch: refs/heads/master
Commit: 010127abf16c630331e86ae68f4219a92565ad4e
Parents: 56e16c3
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 15:27:56 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:33:44 2014 +0000
----------------------------------------------------------------------
.../agent/standalone/TestStandaloneAMDestroy.groovy | 2 ++
.../agent/standalone/TestStandaloneAgentAM.groovy | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/010127ab/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
index d25396d..164f609 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
@@ -44,6 +44,8 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase {
@Test
public void testStandaloneAMDestroy() throws Throwable {
+ skipOnWindows()
+
String clustername = createMiniCluster("", configuration, 1, true)
describe "create a Standalone AM, stop it, try to create" +
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/010127ab/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index 93547f1..c31e9d3 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -129,7 +129,8 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
sleep(5000)
//create another AM
- launcher = createStandaloneAM(clustername, true, true)
+ def newcluster = clustername + "2"
+ launcher = createStandaloneAM(newcluster, true, true)
client = launcher.service
ApplicationId i2AppID = client.applicationId
@@ -140,13 +141,13 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
//but when we look up an instance, we get the new App ID
ApplicationReport instance2 = serviceRegistryClient.findInstance(
- clustername)
+ newcluster)
assert i2AppID == instance2.applicationId
describe("attempting to create instance #3")
//now try to create instance #3, and expect an in-use failure
try {
- createStandaloneAM(clustername, false, true)
+ createStandaloneAM(newcluster, false, true)
fail("expected a failure, got a standalone AM")
} catch (SliderException e) {
assertFailureClusterInUse(e);
@@ -160,7 +161,7 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
describe("Stopping instance #2")
//now stop that cluster
- assert 0 == clusterActionFreeze(client, clustername)
+ assert 0 == clusterActionFreeze(client, newcluster)
logApplications(client.listSliderInstances(username))
@@ -173,11 +174,11 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
ApplicationReport instance3 = serviceRegistryClient.findInstance(
- clustername)
+ newcluster)
assert instance3.yarnApplicationState >= YarnApplicationState.FINISHED
// destroy it
- client.actionDestroy(clustername)
+ client.actionDestroy(newcluster)
}
[21/50] incubator-slider git commit: Storm default secured config
changes
Posted by el...@apache.org.
Storm default secured config changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/15faf908
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/15faf908
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/15faf908
Branch: refs/heads/master
Commit: 15faf908c6e16e2de53f92b896df90ab4a18f1ae
Parents: 1ef5a95
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 18:36:55 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 18:37:48 2014 -0800
----------------------------------------------------------------------
app-packages/storm/appConfig-secured-default.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/15faf908/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index 973c79a..f0eae5c 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -22,7 +22,7 @@
"site.storm-site.transactional.zookeeper.root": "/transactional",
"site.storm-site.storm.zookeeper.port": "2181",
"site.storm-site.nimbus.childopts": "-Xmx1024m -Djava.security.auth.login.config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
- "site.storm-site.supervisor.childopts": "-Xmx256m -Djava.security.auth.login.config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}conf/storm_jaas.conf -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "site.storm-site.supervisor.childopts": "-Xmx256m -Djava.security.auth.login.config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.ui.childopts": "-Xmx768m -Djava.security.auth.login.config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf",
"site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
[48/50] incubator-slider git commit: Enable early out for secure
HBase deployment
Posted by el...@apache.org.
Enable early out for secure HBase deployment
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c2c06d35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c2c06d35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c2c06d35
Branch: refs/heads/master
Commit: c2c06d3532708ac2ed765ebc465edda1b0067025
Parents: 98aff4d
Author: tedyu <yu...@gmail.com>
Authored: Thu Nov 13 09:35:35 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 19:04:18 2014 -0800
----------------------------------------------------------------------
app-packages/hbase/appConfig-secured-default.json | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c2c06d35/app-packages/hbase/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-secured-default.json b/app-packages/hbase/appConfig-secured-default.json
index ba5ae25..2a2b08f 100644
--- a/app-packages/hbase/appConfig-secured-default.json
+++ b/app-packages/hbase/appConfig-secured-default.json
@@ -40,6 +40,7 @@
"site.hbase-site.hbase.security.authentication": "kerberos",
"site.hbase-site.hbase.security.authorization": "true",
+ "site.hbase-site.hbase.security.access.early_out": "true",
"site.hbase-site.hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController",
"site.hbase-site.hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.AccessController",
"site.hbase-site.hbase.regionserver.kerberos.principal": "${USER_NAME}/_HOST@EXAMPLE.COM",
[40/50] incubator-slider git commit: Storm should not call kinit
before starting processes
Posted by el...@apache.org.
Storm should not call kinit before starting processes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e87ab7ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e87ab7ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e87ab7ca
Branch: refs/heads/master
Commit: e87ab7cac45b4d8d2b7664be3385666a4085c832
Parents: a9deb06
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Nov 11 12:23:10 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Nov 12 17:22:18 2014 -0800
----------------------------------------------------------------------
app-packages/storm/package/scripts/service.py | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e87ab7ca/app-packages/storm/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/service.py b/app-packages/storm/package/scripts/service.py
index fb3f83f..7a7dbdf 100644
--- a/app-packages/storm/package/scripts/service.py
+++ b/app-packages/storm/package/scripts/service.py
@@ -55,12 +55,6 @@ def service(
else:
cmd = format("env JAVA_HOME={java64_home} PATH={java64_home}/bin:$PATH STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {python_binary} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
- if params.security_enabled:
- if name == "nimbus":
- Execute(format("{kinit_path_local} -kt {storm_server_keytab_path} {storm_jaas_server_principal}"))
- else:
- Execute(format("{kinit_path_local} -kt {storm_client_keytab_path} {storm_jaas_client_principal}"))
-
Execute(cmd,
not_if=no_op_test,
logoutput=False,
[19/50] incubator-slider git commit: SLIDER-622 add a second destroy
operation after a sleep, may handle directory-not-deleted problems
Posted by el...@apache.org.
SLIDER-622 add a second destroy operation after a sleep, may handle directory-not-deleted problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/34ac14f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/34ac14f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/34ac14f8
Branch: refs/heads/master
Commit: 34ac14f8a5f07371a136dcef6f28242f8081ef65
Parents: d84f83c
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 22:06:45 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:10 2014 +0000
----------------------------------------------------------------------
.../slider/agent/standalone/TestStandaloneAMDestroy.groovy | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/34ac14f8/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
index 6593a0e..4a94eb3 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
@@ -115,6 +115,10 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase {
int exitCode = sliderClient.actionDestroy(clustername);
assert 0 == exitCode
+ sleep(1000)
+ // twice, not expecting an error the second time
+ exitCode = sliderClient.actionDestroy(clustername);
+ assert 0 == exitCode
describe "post destroy checks"
sliderFileSystem.verifyDirectoryNonexistent(instanceDir)
[46/50] incubator-slider git commit: SLIDER-644 Add missing license
header.
Posted by el...@apache.org.
SLIDER-644 Add missing license header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/12b0a2a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/12b0a2a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/12b0a2a5
Branch: refs/heads/master
Commit: 12b0a2a5f13418a2c10e3244a4f57a6ee1c545b4
Parents: fb25d93
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 12 10:52:53 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 19:02:07 2014 -0800
----------------------------------------------------------------------
.../slider/common/params/ActionDiagnosticArgs.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/12b0a2a5/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
index 9feeea4..4b03336 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.slider.common.params;
import com.beust.jcommander.Parameter;
[30/50] incubator-slider git commit: SLIDER-622 add spin-checks for
cluster dir deletion...deals with NTFS problems
Posted by el...@apache.org.
SLIDER-622 add spin-checks for cluster dir deletion...deals with NTFS problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5afa9b39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5afa9b39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5afa9b39
Branch: refs/heads/master
Commit: 5afa9b39d21d396052d82b5472b344e7903a13db
Parents: 7596387
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 14:11:44 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:47 2014 +0000
----------------------------------------------------------------------
.../standalone/TestStandaloneAMDestroy.groovy | 5 ++++
.../slider/test/YarnMiniClusterTestBase.groovy | 29 ++++++++++----------
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5afa9b39/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
index 4a94eb3..d25396d 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy
@@ -121,6 +121,11 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase {
assert 0 == exitCode
describe "post destroy checks"
+ if (fs.exists(instanceDir)) {
+ log.warn("Destroy operation did not delete $instanceDir")
+ rigorousDelete(sliderFileSystem, instanceDir, 60000)
+ }
+
sliderFileSystem.verifyDirectoryNonexistent(instanceDir)
// look up app report and verify exit code is good
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5afa9b39/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index 0850d25..ffd3dab 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -488,11 +488,13 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
def config = miniCluster.config
if (deleteExistingData && !SliderActions.ACTION_UPDATE.equals(action)) {
HadoopFS dfs = HadoopFS.get(new URI(fsDefaultName), config)
- Path clusterDir = new SliderFileSystem(dfs, config).buildClusterDirPath(clustername)
- log.info("deleting customer data at $clusterDir")
+
+ def sliderFileSystem = new SliderFileSystem(dfs, config)
+ Path clusterDir = sliderFileSystem.buildClusterDirPath(clustername)
+ log.info("deleting instance data at $clusterDir")
//this is a safety check to stop us doing something stupid like deleting /
assert clusterDir.toString().contains("/.slider/")
- rigorousDelete(dfs, clusterDir, 60000)
+ rigorousDelete(sliderFileSystem, clusterDir, 60000)
}
@@ -543,26 +545,23 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
* Delete with some pauses and backoff; designed to handle slow delete
* operation in windows
* @param dfs
- * @param clusterDir
+ * @param path
*/
public void rigorousDelete(
- HadoopFS dfs, Path clusterDir, long timeout) {
+ SliderFileSystem sliderFileSystem,
+ Path path, long timeout) {
Duration duration = new Duration(timeout)
duration.start()
+ HadoopFS dfs = sliderFileSystem.fileSystem
boolean deleted = false;
- while (!deleted) {
- dfs.delete(clusterDir, true)
- deleted = !dfs.exists(clusterDir)
- if (!deleted ) {
- if (duration.limitExceeded) {
- assert !dfs.exists(
- clusterDir), "delete operation failed —directory in use?"
-
- }
+ while (!deleted && !duration.limitExceeded) {
+ dfs.delete(path, true)
+ deleted = !dfs.exists(path)
+ if (!deleted) {
sleep(1000)
}
-
}
+ sliderFileSystem.verifyDirectoryNonexistent(path)
}
/**
[15/50] incubator-slider git commit: SLIDER-208 with too many zk dirs
the scan for a test-classes in the (limited) stdout buffer fails
Posted by el...@apache.org.
SLIDER-208 with too many zk dirs the scan for a test-classes in the (limited) stdout buffer fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d704530a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d704530a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d704530a
Branch: refs/heads/master
Commit: d704530ad154baa930500bb160df576a7c59d9af
Parents: 34ac14f
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 22:39:45 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:10 2014 +0000
----------------------------------------------------------------------
.../server/services/workflow/TestWorkflowForkedProcessService.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d704530a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
index 01d5ec9..bc1476a 100644
--- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
+++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
@@ -72,8 +72,6 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
Integer exitCode = process.getExitCode();
assertNotNull("null exit code", exitCode);
assertEquals(0, exitCode.intValue());
-
- assertStringInOutput("test-classes", getFinalOutput());
// assert that the service did not fail
assertNull(process.getFailureCause());
}
[22/50] incubator-slider git commit: Drop VisibilityController from
default appConfig for secure Slider hbase
Posted by el...@apache.org.
Drop VisibilityController from default appConfig for secure Slider hbase
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5591b720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5591b720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5591b720
Branch: refs/heads/master
Commit: 5591b72092826793b2713f8c8c55b6e0a3fc41a0
Parents: 15faf90
Author: tedyu <yu...@gmail.com>
Authored: Mon Nov 10 20:14:56 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Nov 10 20:14:56 2014 -0800
----------------------------------------------------------------------
app-packages/hbase/appConfig-secured-default.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5591b720/app-packages/hbase/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-secured-default.json b/app-packages/hbase/appConfig-secured-default.json
index 19bc04a..dc09dae 100644
--- a/app-packages/hbase/appConfig-secured-default.json
+++ b/app-packages/hbase/appConfig-secured-default.json
@@ -41,8 +41,8 @@
"site.hbase-site.hbase.security.authentication": "kerberos",
"site.hbase-site.hbase.security.authorization": "true",
- "site.hbase-site.hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController,org.apache.hadoop.hbase.security.visibility.VisibilityController",
- "site.hbase-site.hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.AccessController,org.apache.hadoop.hbase.security.visibility.VisibilityController",
+ "site.hbase-site.hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController",
+ "site.hbase-site.hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.AccessController",
"site.hbase-site.hbase.regionserver.kerberos.principal": "${USER_NAME}/_HOST@EXAMPLE.COM",
"site.hbase-site.hbase.regionserver.keytab.file": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.HBASE.service.keytab",
"site.hbase-site.hbase.master.kerberos.principal": "${USER_NAME}/_HOST@EXAMPLE.COM",
[14/50] incubator-slider git commit: SLIDER-622 try and make
TestStandaloneAgentAM more resilient to delayed-deletion
Posted by el...@apache.org.
SLIDER-622 try and make TestStandaloneAgentAM more resilient to delayed-deletion
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f1932ea6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f1932ea6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f1932ea6
Branch: refs/heads/master
Commit: f1932ea63421721b6df140d691dc80f3234417ee
Parents: d704530
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 22:40:33 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:10 2014 +0000
----------------------------------------------------------------------
.../apache/slider/agent/standalone/TestStandaloneAgentAM.groovy | 1 +
.../groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f1932ea6/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index 7987661..93547f1 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -127,6 +127,7 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
assert oldInstance != null
assert oldInstance.yarnApplicationState >= YarnApplicationState.FINISHED
+ sleep(5000)
//create another AM
launcher = createStandaloneAM(clustername, true, true)
client = launcher.service
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f1932ea6/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index 96b1aae..dde8239 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -494,6 +494,9 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
//this is a safety check to stop us doing something stupid like deleting /
assert clusterDir.toString().contains("/.slider/")
dfs.delete(clusterDir, true)
+ sleep(1000)
+ dfs.delete(clusterDir, true)
+ assert !dfs.exists(clusterDir), "delete operation failed —application in use?"
}
[47/50] incubator-slider git commit: Use HFile v2 for Slider HBase
Posted by el...@apache.org.
Use HFile v2 for Slider HBase
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/98aff4d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/98aff4d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/98aff4d0
Branch: refs/heads/master
Commit: 98aff4d08840530717ce29ce2cb88fbf7ec65df7
Parents: 12b0a2a
Author: tedyu <yu...@gmail.com>
Authored: Thu Nov 13 13:12:27 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 19:03:31 2014 -0800
----------------------------------------------------------------------
app-packages/hbase/appConfig-secured-default.json | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/98aff4d0/app-packages/hbase/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-secured-default.json b/app-packages/hbase/appConfig-secured-default.json
index dc09dae..ba5ae25 100644
--- a/app-packages/hbase/appConfig-secured-default.json
+++ b/app-packages/hbase/appConfig-secured-default.json
@@ -37,7 +37,6 @@
"site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}",
"site.hbase-site.hbase.regionserver.port": "0",
"site.hbase-site.hbase.master.port": "0",
- "site.hbase-site.hfile.format.version": "3",
"site.hbase-site.hbase.security.authentication": "kerberos",
"site.hbase-site.hbase.security.authorization": "true",
[17/50] incubator-slider git commit: SLIDER-622 fix ZK instance
separation problems (windows doesn't to rmdir while cluster is in use)
Posted by el...@apache.org.
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/master
Commit: ad983d9effdaf57972c69e6d34f34b0144ac9a69
Parents: 167f931
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 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")
[06/50] incubator-slider git commit: SLIDER-622 process exit codes
Posted by el...@apache.org.
SLIDER-622 process exit codes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/00cf3065
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/00cf3065
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/00cf3065
Branch: refs/heads/master
Commit: 00cf30655afcba7f65fa76116d39beb94cf60032
Parents: d1c567f
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 20:55:16 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../services/workflow/ForkedProcessService.java | 2 +-
.../server/appmaster/actions/TestActions.groovy | 2 +-
.../apache/slider/test/SliderTestUtils.groovy | 13 +++++++++++--
.../TestWorkflowForkedProcessService.java | 19 ++++++++++++-------
4 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00cf3065/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index b801993..9f6b327 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -264,7 +264,7 @@ public class ForkedProcessService
}
- public int getExitCode() {
+ public Integer getExitCode() {
return process.getExitCode();
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00cf3065/slider-core/src/test/groovy/org/apache/slider/server/appmaster/actions/TestActions.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/actions/TestActions.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/actions/TestActions.groovy
index 7e03e7b..a3a0025 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/actions/TestActions.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/actions/TestActions.groovy
@@ -191,7 +191,7 @@ class TestActions {
queues.renewing("note", renewer)
assert queues.removeRenewingAction("note")
queues.stop()
- queues.waitForServiceToStop(10000)
+ assert queues.waitForServiceToStop(10000)
}
public class ActionNoteExecuted extends AsyncAction {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00cf3065/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index ad18c72..3688644 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -51,6 +51,8 @@ import org.apache.slider.server.services.workflow.ForkedProcessService
import org.junit.Assert
import org.junit.Assume
+import java.util.concurrent.TimeoutException
+
import static Arguments.ARG_OPTION
/**
@@ -530,7 +532,10 @@ class SliderTestUtils extends Assert {
*/
public static ForkedProcessService exec(int status, List<String> commands) {
ForkedProcessService process = exec(commands)
- assert status == process.exitCode
+
+ def exitCode = process.exitCode
+ assert exitCode != null
+ assert status == exitCode
return process
}
/**
@@ -546,7 +551,11 @@ class SliderTestUtils extends Assert {
commands);
process.init(new Configuration());
process.start();
- process.waitForServiceToStop(10000);
+ int timeoutMillis = 5000
+ if (!process.waitForServiceToStop(timeoutMillis)) {
+ throw new TimeoutException(
+ "Process did not stop in " + timeoutMillis + "mS");
+ }
process
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00cf3065/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
index cf0afc1..01d5ec9 100644
--- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
+++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java
@@ -69,7 +69,9 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
initProcess(commandFactory.ls(testDir));
exec();
assertFalse(process.isProcessRunning());
- assertEquals(0, process.getExitCode());
+ Integer exitCode = process.getExitCode();
+ assertNotNull("null exit code", exitCode);
+ assertEquals(0, exitCode.intValue());
assertStringInOutput("test-classes", getFinalOutput());
// assert that the service did not fail
@@ -83,7 +85,8 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
initProcess(commandFactory.exitFalse());
exec();
assertFalse(process.isProcessRunning());
- int exitCode = process.getExitCode();
+ Integer exitCode = process.getExitCode();
+ assertNotNull("null exit code", exitCode);
assertTrue(exitCode != 0);
int corrected = process.getExitCodeSignCorrected();
assertEquals(1, corrected);
@@ -98,8 +101,9 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
String echoText = "hello, world";
initProcess(commandFactory.echo(echoText));
exec();
-
- assertEquals(0, process.getExitCode());
+ Integer exitCode = process.getExitCode();
+ assertNotNull("null exit code", exitCode);
+ assertEquals(0, exitCode.intValue());
assertStringInOutput(echoText, getFinalOutput());
}
@@ -112,8 +116,9 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
env.put(var, val);
initProcess(commandFactory.env());
exec();
-
- assertEquals(0, process.getExitCode());
+ Integer exitCode = process.getExitCode();
+ assertNotNull("null exit code", exitCode);
+ assertEquals(0, exitCode.intValue());
assertStringInOutput(val, getFinalOutput());
}
@@ -137,7 +142,7 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase {
public void exec() throws InterruptedException, TimeoutException {
assertNotNull(process);
process.start();
- process.waitForServiceToStop(5000);
+ assert process.waitForServiceToStop(5000);
}
}
[02/50] incubator-slider git commit: SLIDER-622 test for failfast
execution if file not found
Posted by el...@apache.org.
SLIDER-622 test for failfast execution if file not found
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f2e63f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f2e63f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f2e63f6e
Branch: refs/heads/master
Commit: f2e63f6e12b017e7c63f473af3060f3dc815fe3c
Parents: e074133
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 17:08:13 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../apache/slider/common/tools/TestWindowsSupport.groovy | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2e63f6e/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 51c73b2..25b7c57 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -25,6 +25,7 @@ import org.apache.hadoop.fs.ChecksumFileSystem
import org.apache.hadoop.fs.FSDataInputStream
import org.apache.hadoop.fs.Path
import org.apache.hadoop.fs.FileSystem as HadoopFS
+import org.apache.hadoop.service.ServiceStateException
import org.apache.hadoop.util.Shell
import org.apache.slider.providers.agent.AgentUtils
import org.apache.slider.server.services.workflow.ForkedProcessService
@@ -120,10 +121,15 @@ class TestWindowsSupport extends SliderTestBase {
@Test
public void testExecNonexistentBinary() throws Throwable {
assume(Shell.WINDOWS, "not windows")
- exec(2, ["undefined-application", "--version"])
+ try {
+ exec(2, ["undefined-application", "--version"])
+ } catch (ServiceStateException e) {
+ if (!(e.cause instanceof FileNotFoundException)) {
+ throw e;
+ }
+ }
}
-
@Test
public void testEmitKillCommand() throws Throwable {
killJavaProcesses("regionserver", 9)
[45/50] incubator-slider git commit: SLIDER-649 extends test sleep
times
Posted by el...@apache.org.
SLIDER-649 extends test sleep times
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fb25d935
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fb25d935
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fb25d935
Branch: refs/heads/master
Commit: fb25d9356353c79bd2fd89bf73b913aaa508a630
Parents: 2c6cc49
Author: Jon Maron <jm...@hortonworks.com>
Authored: Thu Nov 13 18:08:05 2014 -0500
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 18:58:10 2014 -0800
----------------------------------------------------------------------
.../slider/agent/standalone/TestStandaloneAMRestart.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb25d935/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMRestart.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMRestart.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMRestart.groovy
index d8f7141..bdcf615 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMRestart.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMRestart.groovy
@@ -80,7 +80,7 @@ class TestStandaloneAMRestart extends AgentMiniClusterTestBase {
// kill again & expect it to be considered a failure
killAmAndWaitForDeath(sliderClient, iteration++, clustername)
- sleep(20000)
+ sleep(40000)
report = sliderClient.applicationReport
assert report.finalApplicationStatus == FinalApplicationStatus.FAILED
@@ -109,8 +109,8 @@ class TestStandaloneAMRestart extends AgentMiniClusterTestBase {
iteration,
clustername)
//give yarn some time to notice
- sleep(20000)
- waitUntilClusterLive(sliderClient, 20000)
+ sleep(40000)
+ waitUntilClusterLive(sliderClient, 40000)
return args
}
[12/50] incubator-slider git commit: SLIDER-622 trying to automate
adding path
Posted by el...@apache.org.
SLIDER-622 trying to automate adding path
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/47473aa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/47473aa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/47473aa1
Branch: refs/heads/master
Commit: 47473aa13e07e50fdd793191f69df36a31f88bd8
Parents: 0b24aee
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 20:16:06 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/47473aa1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2689abf..2898995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1327,7 +1327,7 @@
</os>
</activation>
<properties>
- <test.env.path>${env.PATH}:{$project.basedir}\bin\windows\${hadoop.version}\bin}</test.env.path>
+ <test.env.path>${env.PATH}:${project.basedir}\bin\windows\${hadoop.version}\bin}</test.env.path>
</properties>
<modules>
<module>app-packages/hbase-win</module>
[04/50] incubator-slider git commit: SLIDER-622 test for failfast
execution
Posted by el...@apache.org.
SLIDER-622 test for failfast execution
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5d774e85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5d774e85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5d774e85
Branch: refs/heads/master
Commit: 5d774e85e4e729923932ea56928d1db2d79fa396
Parents: de7f44a
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 16:55:18 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../org/apache/slider/common/tools/TestWindowsSupport.groovy | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5d774e85/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index d7f4121..51c73b2 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -117,6 +117,12 @@ class TestWindowsSupport extends SliderTestBase {
exec(0, ["xargs", "--version"])
}
+ @Test
+ public void testExecNonexistentBinary() throws Throwable {
+ assume(Shell.WINDOWS, "not windows")
+ exec(2, ["undefined-application", "--version"])
+ }
+
@Test
public void testEmitKillCommand() throws Throwable {
[24/50] incubator-slider git commit: Storm secured config defaults
for principal names
Posted by el...@apache.org.
Storm secured config defaults for principal names
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/71a8559d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/71a8559d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/71a8559d
Branch: refs/heads/master
Commit: 71a8559da2e80b9581ca938e5433d9313c60e8c8
Parents: a26840e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 22:34:28 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 22:47:23 2014 -0800
----------------------------------------------------------------------
app-packages/storm/appConfig-secured-default.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/71a8559d/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index f0eae5c..21d32e5 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -39,10 +39,10 @@
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
"site.storm-site.java.security.auth.login.config": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
- "site.storm-site.storm.zookeeper.superACL": "PLACE_JAAS_CLIENT_PRINCIPAL_HERE",
- "site.storm-site.nimbus.admins": "['${USER_NAME}', 'PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE']",
+ "site.storm-site.storm.zookeeper.superACL": "sasl:${USER_NAME}@EXAMPLE.COM",
+ "site.storm-site.nimbus.admins": "['${USER_NAME}']",
"site.storm-site.nimbus.users": "['${USER_NAME}']",
- "site.storm-site.nimbus.supervisor.users": "['PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE']",
+ "site.storm-site.nimbus.supervisor.users": "['${USER_NAME}']",
"site.storm-site.nimubs.authorizer": "backtype.storm.security.auth.authorizer.SimpleACLAuthorizer",
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
@@ -50,8 +50,8 @@
"site.storm-site.ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': 'HTTP/_HOST', 'kerberos.keytab': '/etc/security/keytabs/spnego.service.keytab', 'kerberos.name.rules': 'RULE:[2:$1@$0]([jt]t@.*EXAMPLE.COM)s/.*/$MAPRED_USER/ RULE:[2:$1@$0]([nd]n@.*EXAMPLE.COM)s/.*/$HDFS_USER/DEFAULT'}",
"site.storm-env.kerberos_domain": "EXAMPLE.COM",
- "site.storm-env.storm_client_principal_name": "PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE",
- "site.storm-env.storm_server_principal_name": "PLACE_JAAS_STORMSERVER_PRINCIPAL_HERE/_HOST",
+ "site.storm-env.storm_client_principal_name": "${USER_NAME}@EXAMPLE.COM",
+ "site.storm-env.storm_server_principal_name": "${USER_NAME}/_HOST@EXAMPLE.COM",
"site.storm-env.storm_client_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.client.keytab",
"site.storm-env.storm_server_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.nimbus.keytab"
[42/50] incubator-slider git commit: SLIDER-646 intermittent
AgentLaunchFailureIT test failures
Posted by el...@apache.org.
SLIDER-646 intermittent AgentLaunchFailureIT test failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0cb6eaf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0cb6eaf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0cb6eaf7
Branch: refs/heads/master
Commit: 0cb6eaf76dc94f053ad9d0561b5b78a81c736494
Parents: aa1bd19
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 13 14:01:40 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 13 14:02:13 2014 +0000
----------------------------------------------------------------------
.../slider/funtest/framework/CommandTestBase.groovy | 14 +++++++++++---
.../funtest/lifecycle/AgentLaunchFailureIT.groovy | 4 +++-
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0cb6eaf7/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 210e257..1cb245a 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -615,10 +615,15 @@ abstract class CommandTestBase extends SliderTestUtils {
}
/**
- * Create a templated slider app
+ * Create a templated slider app.
+ * <p>
+ * If the extraArgs list does not contain a --wait parm then a wait
+ * duration of THAW_WAIT_TIME will be added to the launch args.
* @param name name
* @param appTemplate application template
* @param resourceTemplate resource template
+ * @param extraArgs list of extra arguments to the command
+ * @param launchReportFile optional file to save the AM launch report to
* @return the shell
*/
public SliderShell createTemplatedSliderApplication(
@@ -638,9 +643,12 @@ abstract class CommandTestBase extends SliderTestUtils {
ACTION_CREATE, name,
ARG_TEMPLATE, appTemplate,
ARG_RESOURCES, resourceTemplate,
- ARG_OUTPUT, launchReportFile.absolutePath,
- ARG_WAIT, Integer.toString(THAW_WAIT_TIME)
+ ARG_OUTPUT, launchReportFile.absolutePath
]
+
+ if (!extraArgs.contains(ARG_WAIT)) {
+ commands << ARG_WAIT << Integer.toString(THAW_WAIT_TIME)
+ }
maybeAddCommandOption(commands,
[ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME],
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0cb6eaf7/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT.groovy
index 2e1ca0f..51a9010 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT.groovy
@@ -20,6 +20,7 @@ package org.apache.slider.funtest.lifecycle
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
+import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.server.appmaster.SliderAppMaster
import static org.apache.slider.api.InternalKeys.*
@@ -69,6 +70,8 @@ public class AgentLaunchFailureIT extends AgentCommandTestBase
ARG_OPTION, CHAOS_MONKEY_INTERVAL_SECONDS, "60",
ARG_OPTION, CHAOS_MONKEY_PROBABILITY_AM_LAUNCH_FAILURE,
Integer.toString(PROBABILITY_PERCENT_100),
+ ARG_DEFINE, SliderXmlConfKeys.KEY_AM_RESTART_LIMIT + "=1",
+ ARG_WAIT, "0"
],
launchReportFile)
@@ -93,6 +96,5 @@ public class AgentLaunchFailureIT extends AgentCommandTestBase
def sar = lookupApplication(appId)
log.info(sar.toString())
assert sar.diagnostics.contains(SliderAppMaster.E_TRIGGERED_LAUNCH_FAILURE)
-
}
}
[13/50] incubator-slider git commit: SLIDER-208 TestLongLivedProcess:
with too many zk dirs the scan for a test-classes in the (limited) stdout
buffer fails
Posted by el...@apache.org.
SLIDER-208 TestLongLivedProcess: with too many zk dirs the scan for a test-classes in the (limited) stdout buffer fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0e4c5da8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0e4c5da8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0e4c5da8
Branch: refs/heads/master
Commit: 0e4c5da89be486d0b6bc8a63a2d8d005825b455a
Parents: f1932ea
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 22:42:51 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:10 2014 +0000
----------------------------------------------------------------------
.../slider/server/services/workflow/TestLongLivedProcess.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0e4c5da8/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
index 545ba48..0eb2b78 100644
--- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
+++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
@@ -70,8 +70,6 @@ public class TestLongLivedProcess extends WorkflowServiceTestBase implements
assertTrue("process stop callback not received", stopped);
assertFalse(process.isRunning());
assertEquals(0, process.getExitCode().intValue());
-
- assertStringInOutput("test-classes", getFinalOutput());
}
@Test
[29/50] incubator-slider git commit: SLIDER-637 rm unneeded test in
TestZKIntegration
Posted by el...@apache.org.
SLIDER-637 rm unneeded test in TestZKIntegration
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/632346e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/632346e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/632346e5
Branch: refs/heads/master
Commit: 632346e540e1cac1ae6bac6b8ce1ed5bc5ba9772
Parents: 62c87ec
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 13:50:30 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:47 2014 +0000
----------------------------------------------------------------------
.../apache/slider/common/tools/TestZKIntegration.groovy | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/632346e5/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 0aa1b91..431c49f 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
@@ -59,16 +59,6 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
zki = null;
}
- @Test
- public void testIntegrationCreate() throws Throwable {
- assertHasZKCluster()
- initZKI()
- String userPath = ZKIntegration.mkSliderUserPath(USER)
- Stat stat = zki.stat(userPath)
- assert stat != null
- log.info("User path $userPath has stat $stat")
- }
-
public ZKIntegration initZKI() {
zki = createZKIntegrationInstance(
getZKBinding(), methodName.methodName, true, false, 5000)
[18/50] incubator-slider git commit: SLIDER-622 pull fixup of
hadoop/bin from windows profile; needs to be done explicitly
Posted by el...@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/ee4fec7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ee4fec7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ee4fec7c
Branch: refs/heads/master
Commit: ee4fec7c57205fe78dc3ab27d8f3a0bc4d985b68
Parents: ad983d9
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 22:48:10 2014 +0000
----------------------------------------------------------------------
pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ee4fec7c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2898995..f11641f 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>
[03/50] incubator-slider git commit: pre-SLIDER-622: fix declaration
of powermock and jettison versions in root POM
Posted by el...@apache.org.
pre-SLIDER-622: fix declaration of powermock and jettison versions in root POM
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e0741337
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e0741337
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e0741337
Branch: refs/heads/master
Commit: e0741337b86bd2d4ad8802c48693c247e2a9cb24
Parents: 5d774e8
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 16:59:12 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
pom.xml | 59 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e0741337/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32d5146..a4f8042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1267,36 +1267,37 @@
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.5</version>
+ </dependency>
+
</dependencies>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-easymock</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.5</version>
- </dependency>
</dependencyManagement>
[23/50] incubator-slider git commit: SLIDER-634. slider wrapper
should look for and use python version greater than or equal to 2.6 (Yu Liu
via smohanty)
Posted by el...@apache.org.
SLIDER-634. slider wrapper should look for and use python version greater than or equal to 2.6 (Yu Liu via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a26840e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a26840e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a26840e3
Branch: refs/heads/master
Commit: a26840e3e73f12e40a8d6c468b60932f654c160d
Parents: 5591b72
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 19:47:53 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 22:47:10 2014 -0800
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a26840e3/slider-assembly/src/main/scripts/slider
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider
index 9646694..97dabaf 100755
--- a/slider-assembly/src/main/scripts/slider
+++ b/slider-assembly/src/main/scripts/slider
@@ -23,11 +23,21 @@ import os
import sys
import subprocess
-ON_POSIX = 'posix' in sys.builtin_module_names
+pyExecPath = None
+
+if os.path.isfile('/usr/bin/python2.7') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python2.7'
+if os.path.isfile('/usr/bin/python2.6') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python2.6'
+if os.path.isfile('/usr/bin/python') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python'
+if pyExecPath is None:
+ pyExecPath = 'python'
+ON_POSIX = 'posix' in sys.builtin_module_names
currDir = os.path.dirname(os.path.realpath(__file__))
args = sys.argv[1:]
-cmd = [currDir + "/slider.py"]
+cmd = [pyExecPath + " " + currDir + "/slider.py"]
cmd.extend(args)
finalCmd = " ".join(cmd)
[44/50] incubator-slider git commit: SLIDER-555. Default ZK node is
not getting deleted when you destroy an application
Posted by el...@apache.org.
SLIDER-555. Default ZK node is not getting deleted when you destroy an application
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2c6cc497
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2c6cc497
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2c6cc497
Branch: refs/heads/master
Commit: 2c6cc4973edba44c5aaeea93653742e519c7188c
Parents: c7186e1
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Nov 13 18:15:03 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Nov 13 18:24:48 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2c6cc497/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 164e2fe..ee5be65 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -546,6 +546,11 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
if (!deleted) {
log.warn("Filesystem returned false from delete() operation");
}
+
+ if(!deleteZookeeperNode(clustername)) {
+ log.warn("Unable to perform node cleanup in Zookeeper.");
+ }
+
if (fs.exists(clusterDirectory)) {
log.warn("Failed to delete {}", clusterDirectory);
}
[50/50] incubator-slider git commit: Merge tag 'release-0.60.0'
Posted by el...@apache.org.
Merge tag 'release-0.60.0'
Slider 0.60.0 incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b70d830a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b70d830a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b70d830a
Branch: refs/heads/master
Commit: b70d830aee6fc0171cb36fff0604b310dc565e3e
Parents: 08ffa87 c2c06d3
Author: Josh Elser <el...@apache.org>
Authored: Sat Nov 22 17:01:48 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sat Nov 22 17:01:48 2014 -0500
----------------------------------------------------------------------
README.md | 32 +-
app-packages/accumulo/README.md | 113 +
app-packages/accumulo/README.txt | 47 -
app-packages/accumulo/appConfig-default.json | 69 +
.../accumulo/appConfig-secured-default.json | 70 +
app-packages/accumulo/appConfig.json | 61 -
.../accumulo/configuration/accumulo-env.xml | 89 +
.../accumulo/configuration/accumulo-site.xml | 19 +-
app-packages/accumulo/configuration/client.xml | 49 +
app-packages/accumulo/configuration/global.xml | 94 -
app-packages/accumulo/getconf.sh | 21 +
app-packages/accumulo/metainfo.xml | 30 +-
.../accumulo/package/files/accumulo-metrics.xml | 8 +-
.../accumulo/package/files/log4j.properties | 3 +-
.../accumulo/package/scripts/accumulo_client.py | 2 +-
.../package/scripts/accumulo_configuration.py | 70 +-
.../accumulo/package/scripts/accumulo_script.py | 53 +-
.../package/scripts/accumulo_service.py | 2 +-
app-packages/accumulo/package/scripts/params.py | 61 +-
.../package/templates/accumulo-env.sh.j2 | 2 +-
app-packages/accumulo/pom.xml | 153 +-
app-packages/accumulo/resources-default.json | 38 +
app-packages/accumulo/resources.json | 36 -
app-packages/accumulo/src/assembly/accumulo.xml | 36 +-
.../slider/accumulo/CustomAuthenticator.java | 118 +
.../apache/slider/accumulo/ProviderUtil.java | 36 +
.../AccumuloAgentCommandTestBase.groovy | 10 +-
.../funtest/accumulo/AccumuloBasicIT.groovy | 133 +-
.../accumulo/AccumuloMonitorSSLIT.groovy | 45 +-
.../funtest/accumulo/AccumuloReadWriteIT.groovy | 11 +-
.../accumulo/AccumuloReadWriteSSLIT.groovy | 75 +
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 154 ++
.../slider/funtest/accumulo/CertUtil.java | 275 +++
.../test/resources/appConfig_monitor_ssl.json | 62 -
.../accumulo/src/test/resources/resources.json | 6 +-
.../test/resources/resources_with_client.json | 41 +
app-packages/app-pkg-template/README.txt | 7 +-
.../app-pkg-template/appConfig-default.json | 20 +
app-packages/app-pkg-template/appConfig.json | 21 -
app-packages/app-pkg-template/metainfo.xml | 8 +-
.../app-pkg-template/resources-default.json | 16 +
app-packages/app-pkg-template/resources.json | 16 -
.../command-logger/application-pkg/pom.xml | 40 +-
.../command-logger/slider-pkg/appConfig.json | 16 +-
.../command-logger/slider-pkg/metainfo.xml | 12 +-
.../slider-pkg/package/scripts/cl.py | 1 -
.../slider-pkg/package/scripts/params.py | 1 -
app-packages/command-logger/slider-pkg/pom.xml | 45 +-
app-packages/hbase-win/README.txt | 38 +
app-packages/hbase-win/appConfig-default.json | 38 +
.../hbase-win/configuration/hbase-env.xml | 54 +
.../hbase-win/configuration/hbase-log4j.xml | 143 ++
.../hbase-win/configuration/hbase-policy.xml | 53 +
.../hbase-win/configuration/hbase-site.xml | 370 +++
app-packages/hbase-win/jmx_metrics.json | 56 +
app-packages/hbase-win/metainfo.xml | 170 ++
.../hbase-win/package/scripts/__init__.py | 19 +
.../hbase-win/package/scripts/functions.py | 40 +
app-packages/hbase-win/package/scripts/hbase.py | 61 +
.../hbase-win/package/scripts/hbase_master.py | 63 +
.../package/scripts/hbase_regionserver.py | 63 +
.../hbase-win/package/scripts/hbase_rest.py | 62 +
.../hbase-win/package/scripts/hbase_service.py | 69 +
.../hbase-win/package/scripts/hbase_thrift.py | 62 +
.../hbase-win/package/scripts/hbase_thrift2.py | 62 +
.../hbase-win/package/scripts/params.py | 74 +
.../hbase-win/package/scripts/status_params.py | 26 +
.../package/templates/hbase_client_jaas.conf.j2 | 22 +
.../package/templates/hbase_master_jaas.conf.j2 | 25 +
.../templates/hbase_regionserver_jaas.conf.j2 | 25 +
app-packages/hbase-win/pom.xml | 91 +
app-packages/hbase-win/resources-default.json | 39 +
app-packages/hbase-win/src/assembly/hbase.xml | 68 +
app-packages/hbase/README.md | 84 +
app-packages/hbase/README.txt | 75 -
app-packages/hbase/appConfig-default.json | 46 +
.../hbase/appConfig-secured-default.json | 63 +
app-packages/hbase/appConfig.json | 70 -
app-packages/hbase/configuration/global.xml | 160 --
app-packages/hbase/configuration/hbase-env.xml | 117 +
.../hbase/configuration/hbase-log4j.xml | 1 +
app-packages/hbase/configuration/hbase-site.xml | 19 +-
app-packages/hbase/ganglia_metrics.json | 38 +
app-packages/hbase/metainfo.xml | 42 +-
app-packages/hbase/package/scripts/hbase.py | 28 +-
.../hbase/package/scripts/hbase_service.py | 4 +-
app-packages/hbase/package/scripts/params.py | 26 +-
.../hbase/package/templates/hbase-env.sh.j2 | 81 -
app-packages/hbase/pom.xml | 320 +--
app-packages/hbase/resources-default.json | 39 +
app-packages/hbase/resources.json | 36 -
app-packages/hbase/src/assembly/hbase.xml | 27 +-
.../test/resources/appConfig_monitor_ssl.json | 1 -
.../src/test/resources/resources-default.json | 23 +
.../hbase/src/test/resources/resources.json | 21 -
app-packages/memcached-win/README.txt | 7 +-
.../memcached-win/appConfig-default.json | 21 +
app-packages/memcached-win/appConfig.json | 26 -
app-packages/memcached-win/metainfo.xml | 18 +-
.../memcached-win/package/scripts/memcached.py | 7 +-
.../memcached-win/package/scripts/params.py | 2 +-
.../memcached-win/resources-default.json | 16 +
app-packages/memcached-win/resources.json | 16 -
app-packages/memcached/README.txt | 18 +-
app-packages/memcached/appConfig-default.json | 20 +
app-packages/memcached/appConfig.json | 26 -
app-packages/memcached/metainfo.xml | 18 +-
.../memcached/package/scripts/memcached.py | 4 +-
.../memcached/package/scripts/params.py | 1 -
app-packages/memcached/resources-default.json | 16 +
app-packages/memcached/resources.json | 16 -
app-packages/storm-win/README.txt | 36 +
app-packages/storm-win/appConfig-default.json | 39 +
.../storm-win/configuration/storm-env.xml | 65 +
.../storm-win/configuration/storm-site.xml | 580 +++++
app-packages/storm-win/metainfo.xml | 150 ++
.../storm-win/package/scripts/drpc_server.py | 55 +
.../storm-win/package/scripts/nimbus.py | 55 +
.../storm-win/package/scripts/params.py | 39 +
.../storm-win/package/scripts/rest_api.py | 57 +
.../storm-win/package/scripts/service.py | 76 +
.../storm-win/package/scripts/status_params.py | 35 +
app-packages/storm-win/package/scripts/storm.py | 45 +
.../storm-win/package/scripts/supervisor.py | 61 +
.../storm-win/package/scripts/ui_server.py | 55 +
.../storm-win/package/scripts/yaml_config.py | 80 +
.../storm-win/package/templates/config.yaml.j2 | 37 +
.../package/templates/storm_jaas.conf.j2 | 44 +
app-packages/storm-win/pom.xml | 91 +
app-packages/storm-win/resources-default.json | 29 +
app-packages/storm-win/src/assembly/storm.xml | 68 +
app-packages/storm/README.txt | 27 +-
app-packages/storm/appConfig-default.json | 43 +
.../storm/appConfig-secured-default.json | 67 +
app-packages/storm/appConfig.json | 126 --
app-packages/storm/configuration/global.xml | 39 -
app-packages/storm/configuration/storm-env.xml | 65 +
app-packages/storm/configuration/storm-site.xml | 15 +-
app-packages/storm/jmx_metrics.json | 8 +-
app-packages/storm/metainfo.xml | 55 +-
...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 -
app-packages/storm/package/scripts/params.py | 25 +-
app-packages/storm/package/scripts/service.py | 10 +-
.../storm/package/scripts/status_params.py | 4 +-
app-packages/storm/package/scripts/storm.py | 16 +-
.../storm/package/scripts/yaml_config.py | 17 +-
.../storm/package/templates/config.yaml.j2 | 9 -
.../storm/package/templates/storm_jaas.conf.j2 | 22 +-
app-packages/storm/pom.xml | 90 +
app-packages/storm/resources-default.json | 34 +
app-packages/storm/resources.json | 31 -
app-packages/storm/src/assembly/storm.xml | 75 +
pom.xml | 289 ++-
slider-agent/conf/agent.ini | 1 +
slider-agent/pom.xml | 94 +-
.../src/main/python/agent/ActionQueue.py | 28 +-
.../src/main/python/agent/AgentConfig.py | 14 +
.../src/main/python/agent/AgentToggleLogger.py | 69 +
slider-agent/src/main/python/agent/Constants.py | 1 +
.../src/main/python/agent/Controller.py | 198 +-
.../python/agent/CustomServiceOrchestrator.py | 101 +-
slider-agent/src/main/python/agent/Heartbeat.py | 14 +-
.../src/main/python/agent/ProcessHelper.py | 5 +-
.../src/main/python/agent/PythonExecutor.py | 17 +-
slider-agent/src/main/python/agent/Register.py | 8 +-
slider-agent/src/main/python/agent/Registry.py | 35 +-
slider-agent/src/main/python/agent/main.py | 73 +-
.../main/python/jinja2/ext/Vim/htmljinja.vim | 27 -
.../src/main/python/jinja2/ext/Vim/jinja.vim | 113 -
.../jinja2/ext/django2jinja/django2jinja.py | 768 -------
.../python/jinja2/ext/django2jinja/example.py | 7 -
.../ext/django2jinja/templates/index.html | 58 -
.../ext/django2jinja/templates/layout.html | 4 -
.../ext/django2jinja/templates/subtemplate.html | 1 -
.../src/main/python/jinja2/ext/djangojinja2.py | 86 -
.../src/main/python/jinja2/ext/inlinegettext.py | 78 -
.../src/main/python/jinja2/ext/jinja.el | 213 --
slider-agent/src/main/python/kazoo/client.py | 54 +-
.../src/main/python/kazoo/handlers/threading.py | 6 +-
.../src/main/python/kazoo/handlers/utils.py | 49 +-
.../main/python/kazoo/protocol/connection.py | 78 +-
.../src/main/python/kazoo/testing/__init__.py | 6 -
.../src/main/python/kazoo/testing/common.py | 284 ---
.../src/main/python/kazoo/testing/harness.py | 181 --
.../src/main/python/kazoo/tests/test_client.py | 61 +-
.../main/python/kazoo/tests/test_connection.py | 80 +-
.../python/resource_management/core/logger.py | 20 +-
.../core/providers/__init__.py | 33 +-
.../core/providers/system.py | 38 +-
.../core/providers/windows/system.py | 97 +-
.../core/providers/windows/tarball.py | 46 +
.../core/resources/system.py | 2 +
.../python/resource_management/core/shell.py | 29 +-
.../libraries/functions/check_process_status.py | 49 +-
.../libraries/script/script.py | 2 +-
slider-agent/src/main/python/setup.py | 2 +-
.../src/test/python/agent/TestActionQueue.py | 29 +-
.../test/python/agent/TestAgentToggleLogger.py | 60 +
.../src/test/python/agent/TestController.py | 212 +-
.../agent/TestCustomServiceOrchestrator.py | 91 +-
slider-agent/src/test/python/agent/TestGrep.py | 13 +-
.../src/test/python/agent/TestHeartbeat.py | 19 +-
slider-agent/src/test/python/agent/TestMain.py | 154 +-
.../src/test/python/agent/TestPythonExecutor.py | 43 +-
.../src/test/python/agent/TestRegistration.py | 33 +-
slider-agent/src/test/python/python-wrap | 13 +-
.../resource_management/TestContentSources.py | 148 +-
.../resource_management/TestCopyFromLocal.py | 65 -
.../TestDirectoryResource.py | 14 +-
.../resource_management/TestExecuteResource.py | 105 +-
.../resource_management/TestFileResource.py | 20 +-
.../resource_management/TestLinkResource.py | 148 --
.../python/resource_management/TestPackage.py | 32 +
.../TestPropertiesFileResource.py | 5 +-
slider-agent/src/test/python/unitTests.py | 35 +-
slider-assembly/pom.xml | 106 +-
slider-assembly/src/assembly/slider-bin.xml | 8 +
.../src/conf-hdp/log4j-server.properties | 70 +
slider-assembly/src/conf-hdp/log4j.properties | 17 +-
slider-assembly/src/conf-hdp/slider-client.xml | 88 +-
slider-assembly/src/conf-hdp/slider-env.sh | 26 +
.../src/conf/log4j-server.properties | 70 +
slider-assembly/src/conf/log4j.properties | 17 +-
slider-assembly/src/conf/slider-client.xml | 90 +-
slider-assembly/src/conf/slider-env.sh | 26 +
slider-assembly/src/main/bash/README.md | 2 +-
slider-assembly/src/main/bash/slider_destroy | 4 +-
slider-assembly/src/main/scripts/slider | 81 +-
slider-assembly/src/main/scripts/slider.py | 206 +-
.../src/test/python/scripts/TestSlider.py | 67 +
slider-assembly/src/test/python/unitTests.py | 118 +
slider-core/pom.xml | 158 +-
.../org/apache/slider/api/InternalKeys.java | 48 +-
.../org/apache/slider/api/ResourceKeys.java | 33 +-
.../java/org/apache/slider/api/StatusKeys.java | 7 +-
.../org/apache/slider/api/proto/Messages.java | 17 +
.../slider/api/proto/SliderClusterAPI.java | 18 +-
.../org/apache/slider/client/SliderClient.java | 2114 +++++++++++++-----
.../apache/slider/client/SliderClientAPI.java | 260 +++
.../slider/client/SliderClusterOperations.java | 1 -
.../slider/client/SliderYarnClientImpl.java | 49 +-
.../org/apache/slider/common/Constants.java | 1 -
.../apache/slider/common/SliderExitCodes.java | 35 +-
.../org/apache/slider/common/SliderKeys.java | 52 +-
.../common/SliderXMLConfKeysForTesting.java | 16 +-
.../apache/slider/common/SliderXmlConfKeys.java | 27 +-
.../common/params/AbstractActionArgs.java | 17 +-
.../AbstractClusterBuildingActionArgs.java | 4 +
.../slider/common/params/ActionCreateArgs.java | 7 +
.../slider/common/params/ActionDestroyArgs.java | 1 +
.../common/params/ActionDiagnosticArgs.java | 73 +
.../slider/common/params/ActionExistsArgs.java | 13 +-
.../slider/common/params/ActionFreezeArgs.java | 2 +-
.../slider/common/params/ActionGetConfArgs.java | 51 -
.../slider/common/params/ActionHelpArgs.java | 16 +-
.../common/params/ActionInstallKeytabArgs.java | 57 +
.../common/params/ActionInstallPackageArgs.java | 58 +
.../slider/common/params/ActionListArgs.java | 13 +
.../slider/common/params/ActionLookupArgs.java | 76 +
.../common/params/ActionRegistryArgs.java | 70 +-
.../slider/common/params/ActionResolveArgs.java | 153 ++
.../slider/common/params/ActionThawArgs.java | 8 +
.../slider/common/params/ActionVersionArgs.java | 12 +-
.../org/apache/slider/common/params/ArgOps.java | 2 +-
.../apache/slider/common/params/Arguments.java | 37 +-
.../apache/slider/common/params/ClientArgs.java | 106 +-
.../apache/slider/common/params/CommonArgs.java | 72 +-
.../common/params/LaunchArgsAccessor.java | 6 +-
.../common/params/LaunchArgsDelegate.java | 11 +
.../common/params/SliderAMCreateAction.java | 7 +
.../slider/common/params/SliderActions.java | 24 +-
.../slider/common/tools/ConfigHelper.java | 73 +-
.../slider/common/tools/CoreFileSystem.java | 108 +-
.../apache/slider/common/tools/PortScanner.java | 90 +
.../apache/slider/common/tools/SliderUtils.java | 1027 +++++++--
.../slider/core/build/InstanceBuilder.java | 53 +-
.../apache/slider/core/build/InstanceIO.java | 8 +-
.../apache/slider/core/conf/AggregateConf.java | 34 +
.../org/apache/slider/core/conf/ConfTree.java | 7 +
.../slider/core/conf/ConfTreeOperations.java | 4 +-
.../apache/slider/core/conf/MapOperations.java | 38 +-
.../conf/TemplateInputPropertiesValidator.java | 2 +-
.../exceptions/BadClusterStateException.java | 2 +-
.../slider/core/exceptions/ErrorStrings.java | 2 +-
.../core/exceptions/ExceptionConverter.java | 16 +-
.../core/exceptions/MissingArgException.java | 26 -
.../core/exceptions/NotFoundException.java | 35 +
.../slider/core/exceptions/SliderException.java | 6 +-
.../TriggerClusterTeardownException.java | 15 +-
.../slider/core/exceptions/UsageException.java | 34 +
.../slider/core/launch/AbstractLauncher.java | 110 +-
.../slider/core/launch/AppMasterLauncher.java | 60 +-
.../core/launch/ClasspathConstructor.java | 2 +-
.../core/launch/JavaCommandLineBuilder.java | 4 +-
.../slider/core/launch/LaunchedApplication.java | 6 +
.../launch/SerializedApplicationReport.java | 92 +
.../slider/core/main/LauncherExitCodes.java | 141 +-
.../slider/core/main/ServiceLauncher.java | 8 +-
.../core/persist/ApplicationReportSerDeser.java | 57 +
.../slider/core/persist/JsonSerDeser.java | 54 +-
.../core/registry/SliderRegistryUtils.java | 62 +
.../core/registry/YARNRegistryClient.java | 85 -
.../slider/core/registry/YarnAppListClient.java | 104 +
.../core/registry/docstore/ExportEntry.java | 120 +
.../docstore/PublishedConfiguration.java | 6 +-
.../registry/docstore/PublishedExports.java | 139 ++
.../docstore/PublishedExportsOutputter.java | 104 +
.../registry/docstore/PublishedExportsSet.java | 100 +
.../registry/info/CommonRegistryConstants.java | 25 -
.../registry/info/CustomRegistryConstants.java | 28 +-
.../core/registry/info/RegisteredDocument.java | 33 -
.../core/registry/info/RegisteredEndpoint.java | 206 --
.../core/registry/info/RegistryFields.java | 34 -
.../core/registry/info/RegistryNaming.java | 51 -
.../slider/core/registry/info/RegistryView.java | 41 -
.../core/registry/info/ServiceInstanceData.java | 139 --
.../registry/retrieve/RegistryRetriever.java | 224 +-
.../apache/slider/core/zk/ZKIntegration.java | 18 +-
.../apache/slider/core/zk/ZookeeperUtils.java | 3 +-
.../providers/AbstractClientProvider.java | 13 +-
.../providers/AbstractProviderService.java | 99 +-
.../slider/providers/PlacementPolicy.java | 22 +-
.../apache/slider/providers/ProviderCore.java | 9 +-
.../slider/providers/ProviderService.java | 27 +-
.../apache/slider/providers/ProviderUtils.java | 67 +-
.../providers/agent/AgentClientProvider.java | 119 +-
.../slider/providers/agent/AgentKeys.java | 12 +-
.../providers/agent/AgentProviderService.java | 962 ++++++--
.../slider/providers/agent/AgentUtils.java | 31 +-
.../apache/slider/providers/agent/Command.java | 6 +-
.../providers/agent/ComponentInstanceState.java | 3 +-
.../providers/agent/ComponentTagProvider.java | 127 ++
.../agent/application/metadata/Application.java | 11 +-
.../agent/application/metadata/Component.java | 43 +
.../agent/application/metadata/ConfigFile.java | 53 +
.../metadata/ConfigurationDependencies.java | 39 -
.../application/metadata/DefaultConfig.java | 39 +
.../metadata/DefaultConfigParser.java | 54 +
.../agent/application/metadata/Metainfo.java | 19 +
.../application/metadata/MetainfoParser.java | 10 +-
.../application/metadata/PropertyInfo.java | 54 +
.../slideram/SliderAMClientProvider.java | 125 +-
.../slideram/SliderAMProviderService.java | 105 +-
.../apache/slider/server/appmaster/AMUtils.java | 5 +-
.../server/appmaster/RoleLaunchService.java | 29 +-
.../server/appmaster/SliderAppMaster.java | 1005 ++++++---
.../server/appmaster/actions/ActionHalt.java | 6 +-
.../appmaster/actions/ActionKillContainer.java | 20 +-
.../appmaster/actions/ActionStartContainer.java | 8 +-
.../appmaster/actions/ActionStopQueue.java | 8 +-
.../appmaster/actions/ActionStopSlider.java | 120 +-
.../server/appmaster/actions/AsyncAction.java | 49 +-
.../actions/ProviderReportedContainerLoss.java | 13 +-
.../actions/ProviderStartupCompleted.java | 4 -
.../server/appmaster/actions/QueueAccess.java | 5 +
.../server/appmaster/actions/QueueExecutor.java | 10 +
.../server/appmaster/actions/QueueService.java | 33 +-
.../actions/RegisterComponentInstance.java | 14 +-
.../appmaster/actions/RenewingAction.java | 36 +-
.../actions/ReviewAndFlexApplicationSize.java | 43 +
.../actions/UnregisterComponentInstance.java | 7 +-
.../server/appmaster/monkey/ChaosEntry.java | 11 +-
.../appmaster/monkey/ChaosKillContainer.java | 13 +-
.../appmaster/monkey/ChaosMonkeyService.java | 81 +-
.../operations/AsyncRMOperationHandler.java | 53 +-
.../operations/CancelRequestOperation.java | 58 +
.../operations/ContainerRequestOperation.java | 3 +-
.../ProviderNotifyingOperationHandler.java | 9 +-
.../operations/RMOperationHandler.java | 4 +-
.../operations/RMOperationHandlerActions.java | 9 +
.../slider/server/appmaster/rpc/RpcBinder.java | 2 +-
.../rpc/SliderClusterProtocolProxy.java | 20 +-
.../security/SecurityConfiguration.java | 168 ++
.../slider/server/appmaster/state/AppState.java | 339 ++-
.../appmaster/state/ContainerPriority.java | 37 +-
.../server/appmaster/state/NodeEntry.java | 14 +-
.../server/appmaster/state/NodeInstance.java | 4 +-
.../appmaster/state/OutstandingRequest.java | 10 +-
.../appmaster/state/ProviderAppState.java | 11 +
.../server/appmaster/state/RoleHistory.java | 151 +-
.../server/appmaster/state/RoleInstance.java | 34 +-
.../server/appmaster/state/RoleStatus.java | 133 +-
.../state/StateAccessForProviders.java | 10 +-
.../server/appmaster/web/AgentService.java | 28 +-
.../server/appmaster/web/SliderAMWebApp.java | 23 +-
.../web/SliderAmFilterInitializer.java | 71 -
.../server/appmaster/web/SliderAmIpFilter.java | 155 --
.../slider/server/appmaster/web/WebAppApi.java | 6 +-
.../server/appmaster/web/WebAppApiImpl.java | 73 +-
.../appmaster/web/rest/AMWebServices.java | 9 +
.../server/appmaster/web/rest/RestPaths.java | 5 +-
.../appmaster/web/rest/agent/AgentWebApp.java | 20 +-
.../web/rest/agent/ExecutionCommand.java | 17 +
.../web/rest/agent/HeartBeatResponse.java | 12 +
.../appmaster/web/rest/agent/Register.java | 35 +-
.../web/rest/agent/RegistrationResponse.java | 14 +-
.../appmaster/web/rest/agent/StatusCommand.java | 13 +
.../web/rest/publisher/PublisherResource.java | 32 +-
.../web/rest/registry/PathEntryResource.java | 45 +
.../web/rest/registry/RegistryResource.java | 157 ++
.../server/appmaster/web/view/IndexBlock.java | 78 +-
.../server/services/curator/CuratorHelper.java | 138 --
.../server/services/curator/CuratorService.java | 98 -
.../curator/CuratorServiceInstance.java | 77 -
.../curator/CuratorServiceInstances.java | 41 -
.../server/services/curator/CuratorUriSpec.java | 57 -
.../services/curator/RegistryBinderService.java | 315 ---
.../registry/RegistryDiscoveryContext.java | 36 -
.../registry/RegistryRestResources.java | 178 --
.../registry/RegistryServiceConstants.java | 26 -
.../registry/RegistryViewForProviders.java | 48 -
.../registry/SliderRegistryService.java | 99 -
.../services/security/CertificateManager.java | 189 +-
.../security/FsDelegationTokenManager.java | 285 +++
.../server/services/security/SecurityUtils.java | 40 +-
.../utility/AbstractSliderLaunchedService.java | 83 +-
.../services/utility/EndOfServiceWaiter.java | 87 +
.../LaunchedWorkflowCompositeService.java | 4 +
.../services/workflow/ClosingService.java | 3 +
.../services/workflow/ForkedProcessService.java | 23 +-
.../services/workflow/LongLivedProcess.java | 61 +-
.../workflow/WorkflowSequenceService.java | 8 +-
.../YarnRegistryViewForProviders.java | 270 +++
.../slider/providers/agent/conf/command.json | 1 -
.../providers/agent/conf/command_template.json | 1 -
.../providers/slideram/instance/appconf.json | 3 +-
.../providers/slideram/instance/resources.json | 2 +-
.../test_command_log/appConfig.json | 16 +-
.../test_command_log/appConfig_fast_no_reg.json | 13 +-
.../test_command_log/appConfig_no_hb.json | 13 +-
.../test_command_log/resources.json | 4 +-
.../test_command_log/resources_no_role.json | 2 +
.../resources_queue_labels.json | 19 +
.../agent/AgentMiniClusterTestBase.groovy | 24 +-
.../agent/actions/TestActionExists.groovy | 19 +-
.../actions/TestActionInstallPackage.groovy | 157 ++
.../slider/agent/actions/TestActionList.groovy | 110 +-
.../agent/actions/TestActionStatus.groovy | 16 +-
.../agent/actions/TestActionVersion.groovy | 5 +-
.../agent/freezethaw/TestFreezeCommands.groovy | 13 +-
.../TestFreezeThawFlexStandaloneAM.groovy | 153 ++
.../TestFreezeThawMasterlessAM.groovy | 92 -
.../freezethaw/TestFreezeUnknownCluster.groovy | 2 +-
.../standalone/TestBuildStandaloneAM.groovy | 31 +-
.../standalone/TestStandaloneAMDestroy.groovy | 55 +-
.../standalone/TestStandaloneAMKill.groovy | 8 +-
.../TestStandaloneAMMonkeyRestart.groovy | 24 +-
.../standalone/TestStandaloneAMRestart.groovy | 77 +-
.../standalone/TestStandaloneAgentAM.groovy | 99 +-
.../standalone/TestStandaloneRegistryAM.groovy | 362 ---
.../TestStandaloneYarnRegistryAM.groovy | 555 +++++
.../slider/client/TestClientBadArgs.groovy | 67 +-
.../slider/client/TestClientBasicArgs.groovy | 18 +-
.../slider/client/TestCommonArgParsing.groovy | 36 +-
.../apache/slider/client/TestDiagnostics.groovy | 58 +
.../slider/client/TestInstallKeytab.groovy | 210 ++
.../slider/client/TestReplaceTokens.groovy | 62 +
.../tools/TestClientResourceRegistration.groovy | 27 +-
.../slider/common/tools/TestConfigHelper.groovy | 65 +
.../common/tools/TestConfigHelperHDFS.groovy | 23 +-
.../tools/TestExecutionEnvironment.groovy | 64 +
.../common/tools/TestMiscSliderUtils.groovy | 3 +
.../slider/common/tools/TestPortScan.groovy | 91 +-
.../common/tools/TestWindowsSupport.groovy | 227 ++
.../common/tools/TestZKIntegration.groovy | 79 +-
.../slider/core/conf/TestConfTreeResolve.groovy | 22 +-
.../slider/providers/agent/AgentTestBase.groovy | 12 +
.../providers/agent/AgentTestUtils.groovy | 2 +-
.../agent/TestAgentAMManagementWS.groovy | 145 +-
.../slider/providers/agent/TestAgentEcho.groovy | 60 +-
.../providers/agent/TestBuildBasicAgent.groovy | 216 +-
.../slider/registry/TestRegistryPaths.groovy | 64 +
.../registry/curator/TestLocalRegistry.groovy | 163 --
.../curator/TestRegistryRestResources.groovy | 195 --
.../curator/TestServiceInstanceSerDeser.groovy | 122 -
.../appmaster/TestDelayInContainerLaunch.groovy | 170 ++
.../server/appmaster/actions/TestActions.groovy | 2 +-
.../TestMockAppStateContainerFailure.groovy | 8 +-
.../TestMockAppStateDynamicHistory.groovy | 235 ++
.../TestMockAppStateDynamicRoles.groovy | 178 +-
.../TestMockAppStateFlexDynamicRoles.groovy | 40 +-
.../appstate/TestMockAppStateFlexing.groovy | 24 +
.../TestMockAppStateRMOperations.groovy | 194 +-
.../TestMockAppStateRebuildOnAMRestart.groovy | 10 +-
.../TestMockAppStateRolePlacement.groovy | 9 +-
.../TestRoleHistoryContainerEvents.groovy | 55 +
.../model/history/TestRoleHistoryRW.groovy | 4 +-
.../TestRoleHistoryRequestTracking.groovy | 3 +-
.../appmaster/model/mock/Allocator.groovy | 8 +-
.../model/mock/BaseMockAppStateTest.groovy | 63 +-
.../appmaster/model/mock/MockAppState.groovy | 25 +
.../model/mock/MockApplicationAttemptId.groovy | 8 +
.../model/mock/MockApplicationId.groovy | 9 +-
.../appmaster/model/mock/MockContainer.groovy | 7 +-
.../appmaster/model/mock/MockContainerId.groovy | 39 +-
.../appmaster/model/mock/MockFactory.groovy | 4 +-
.../model/mock/MockProviderService.groovy | 33 +-
.../model/mock/MockRMOperationHandler.groovy | 22 +-
.../model/mock/MockRegistryOperations.groovy | 101 +
.../appmaster/model/mock/MockRoleHistory.groovy | 35 +
.../appmaster/model/mock/MockYarnCluster.groovy | 17 +-
.../appmaster/model/mock/MockYarnEngine.groovy | 6 +
.../model/monkey/TestMockMonkey.groovy | 62 +-
.../security/SecurityConfigurationTest.groovy | 177 ++
.../publisher/TestPublisherRestResources.groovy | 31 +-
.../rest/registry/PathEntryMarshalling.groovy | 28 +
.../registry/TestRegistryRestMarshalling.groovy | 50 +
.../registry/TestRegistryRestResources.groovy | 217 ++
.../view/TestClusterSpecificationBlock.groovy | 7 +-
.../web/view/TestContainerStatsBlock.groovy | 28 +-
.../appmaster/web/view/TestIndexBlock.groovy | 51 +-
.../TestFsDelegationTokenManager.groovy | 245 ++
.../apache/slider/test/MicroZKCluster.groovy | 31 +-
.../org/apache/slider/test/Outcome.groovy | 47 +
.../apache/slider/test/SliderTestBase.groovy | 5 +-
.../apache/slider/test/SliderTestUtils.groovy | 416 +++-
.../apache/slider/test/TestAssertions.groovy | 41 +
.../slider/test/YarnMiniClusterTestBase.groovy | 213 +-
.../test/YarnZKMiniClusterTestBase.groovy | 32 +-
.../slider/common/tools/TestSliderUtils.java | 65 +
.../core/launch/TestAppMasterLauncher.java | 104 +
.../agent/TestAgentClientProvider.java | 2 +-
.../agent/TestAgentClientProvider2.java | 88 +
.../agent/TestAgentProviderService.java | 658 +++++-
.../agent/TestComponentTagProvider.java | 115 +
.../application/metadata/TestConfigParser.java | 107 +
.../metadata/TestMetainfoParser.java | 7 +
.../appmaster/web/TestSliderAmFilter.java | 200 --
.../web/rest/agent/TestAMAgentWebServices.java | 62 +-
.../management/TestAMManagementWebServices.java | 2 +-
.../publisher/TestAgentProviderService.java | 10 +-
.../security/TestCertificateManager.java | 5 +-
.../services/workflow/EndOfServiceWaiter.java | 56 -
.../workflow/ProcessCommandFactory.java | 21 +-
.../services/workflow/TestLongLivedProcess.java | 11 +-
.../workflow/TestWorkflowClosingService.java | 4 +-
.../TestWorkflowForkedProcessService.java | 29 +-
.../workflow/WorkflowServiceTestBase.java | 3 +-
slider-core/src/test/python/agent/main.py | 5 +-
slider-core/src/test/python/metainfo.xml | 21 +
.../src/test/resources/example-slider-test.xml | 4 +-
slider-core/src/test/resources/log4j.properties | 3 +-
.../slider/common/tools/test/metainfo.xml | 11 +-
.../examples/app_configuration_tokenized.json | 27 +
.../slider/core/conf/examples/internal.json | 5 +-
.../providers/agent/tests/bad/resources-3.json | 13 +
.../providers/agent/tests/good/resources.json | 4 +-
.../agent/tests/good/resources_with_label.json | 25 +
.../appmaster/web/rest/registry/sample.json | 9 +
slider-funtest/pom.xml | 60 +-
.../org/apache/chaos/remote/BuildPidPath.groovy | 54 +
.../org/apache/chaos/remote/Clustat.groovy | 64 +
.../apache/chaos/remote/JschToCommonsLog.groovy | 78 +
.../chaos/remote/RemoteDaemonOperations.groovy | 60 +
.../org/apache/chaos/remote/RemoteServer.groovy | 188 ++
.../org/apache/chaos/remote/SshCommands.groovy | 190 ++
.../abstracttests/AbstractTestBuildSetup.groovy | 4 +-
.../framework/AgentCommandTestBase.groovy | 145 +-
.../funtest/framework/CommandTestBase.groovy | 869 ++++++-
.../slider/funtest/framework/ConfLoader.groovy | 58 +-
.../funtest/framework/FileUploader.groovy | 1 +
.../funtest/framework/FuntestProperties.groovy | 21 +-
.../slider/funtest/framework/SliderShell.groovy | 243 +-
.../funtest/basic/ClusterConnectivityIT.groovy | 14 +-
.../slider/funtest/basic/SyspropsIT.groovy | 50 +
.../commands/CommandEnvironmentIT.groovy | 107 +
.../funtest/commands/CommandExitCodesIT.groovy | 43 +
.../commands/DiagnosticsCommandIT.groovy | 46 +
.../funtest/commands/ListCommandIT.groovy | 9 +-
.../funtest/commands/ResolveCommandIT.groovy | 64 +
.../funtest/commands/SimpleCommandsIT.groovy | 6 +-
.../commands/UnknownClusterOperationsIT.groovy | 8 -
.../funtest/lifecycle/AMFailuresIT.groovy | 148 ++
.../lifecycle/AgentClusterLifecycleIT.groovy | 88 +-
.../funtest/lifecycle/AgentFailures2IT.groovy | 60 +-
.../funtest/lifecycle/AgentFailuresIT.groovy | 60 +-
.../lifecycle/AgentLaunchFailureIT.groovy | 100 +
.../funtest/lifecycle/AgentRegistryIT.groovy | 167 ++
.../lifecycle/AppsThroughAgentDemo.groovy | 45 +
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 99 +-
.../AppsThroughAgentQueueAndLabelsIT.groovy | 122 +
.../lifecycle/ClusterBuildDestroyIT.groovy | 9 +-
.../src/test/manual/python/SliderTester.py | 4 +-
.../src/test/resources/log4j.properties | 2 +-
.../accumulo/accumulo-funtests/pom.xml | 2 +-
.../accumulo/funtest/AccumuloCIIT.groovy | 4 +-
.../accumulo/slider-accumulo-provider/pom.xml | 8 +-
.../accumulo/AccumuloClientProvider.java | 6 +-
.../accumulo/AccumuloProviderService.java | 2 +-
.../providers/accumulo/AccumuloTestBase.groovy | 13 +-
.../live/TestAccCorrectInstanceName.groovy | 17 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 21 +-
.../accumulo/live/TestAccLiveHDFSArchive.groovy | 8 +-
.../live/TestAccLiveLocalArchive.groovy | 8 +-
.../accumulo/live/TestAccM1T1GC1Mon1.groovy | 8 +-
.../accumulo/live/TestAccM2T2GC1Mon1.groovy | 8 +-
.../accumulo/live/TestAccumuloAMWebApp.groovy | 10 +-
.../live/TestInvalidMonitorAddress.groovy | 10 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
.../funtest/FunctionalHBaseClusterIT.groovy | 14 +-
.../funtest/HBaseClusterBuildDestroyIT.groovy | 4 +-
.../funtest/HBaseClusterLifecycleIT.groovy | 15 +-
.../hbase/slider-hbase-provider/pom.xml | 51 +-
.../providers/hbase/HBaseClientProvider.java | 6 +-
.../slider/providers/hbase/HBaseKeys.java | 2 +-
.../providers/hbase/HBaseProviderService.java | 76 +-
.../minicluster/HBaseMiniClusterTestBase.groovy | 10 +-
.../TestFreezeThawClusterFromArchive.groovy | 2 +-
.../build/TestBuildThawClusterM1W1.groovy | 7 +-
.../failures/TestKilledHBaseAM.groovy | 1 -
.../flexing/TestClusterFlex1To1.groovy | 2 +-
...reezeReconfigureThawLiveRegionService.groovy | 4 +-
.../TestFreezeThawLiveRegionService.groovy | 4 +-
.../minicluster/live/Test2Master2RS.groovy | 6 +-
.../minicluster/live/TestHBaseMaster.groovy | 47 +-
.../live/TestHBaseMasterOnHDFS.groovy | 2 +-
.../live/TestLiveRegionServiceOnHDFS.groovy | 5 +-
.../live/TestLiveTwoNodeRegionService.groovy | 6 +-
.../minicluster/live/TestTwoLiveClusters.groovy | 55 +-
.../clusters/morzine/slider/slider-client.xml | 17 +
.../clusters/offline/slider/slider-client.xml | 16 +
.../clusters/remote/slider/slider-client.xml | 20 +-
src/test/clusters/sandbox/operations.md | 20 +-
.../clusters/sandbox/slider/slider-client.xml | 17 +
src/test/clusters/script.md | 2 +-
src/test/clusters/ubuntu-secure/operations.md | 14 +-
626 files changed, 29467 insertions(+), 11727 deletions(-)
----------------------------------------------------------------------
[26/50] incubator-slider git commit: SLIDER-622: fix ZK Integration
tests to be more independent and better @ cleaning up
Posted by el...@apache.org.
SLIDER-622: fix ZK Integration tests to be more independent and better @ cleaning up
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b88c7759
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b88c7759
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b88c7759
Branch: refs/heads/master
Commit: b88c775949bd2fd9d0605b2d8ea4c86724cbc42b
Parents: e04c51b
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 11:40:44 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:19 2014 +0000
----------------------------------------------------------------------
.../apache/slider/core/zk/ZKIntegration.java | 18 ++++++++-
.../common/tools/TestZKIntegration.groovy | 41 +++++++++++++-------
2 files changed, 44 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b88c7759/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java b/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
index 0d96559..0c28229 100644
--- a/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
+++ b/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
@@ -29,13 +29,14 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-public class ZKIntegration implements Watcher {
+public class ZKIntegration implements Watcher, Closeable {
/**
* Base path for services
@@ -115,7 +116,20 @@ public class ZKIntegration implements Watcher {
createClusterPath,
watchEventHandler);
}
-
+
+
+ @Override
+ public synchronized void close() throws IOException {
+ if (zookeeper != null) {
+ try {
+ zookeeper.close();
+ } catch (InterruptedException ignored) {
+
+ }
+ zookeeper = null;
+ }
+ }
+
public String getConnectionString() {
return zkConnection;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b88c7759/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 460dafb..0aa1b91 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
@@ -21,6 +21,8 @@ package org.apache.slider.common.tools
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.fs.FileUtil
+import org.apache.hadoop.registry.server.services.MicroZookeeperServiceKeys
import org.apache.slider.client.SliderClient
import org.apache.slider.core.zk.ZKIntegration
import org.apache.slider.test.KeysForTests
@@ -28,6 +30,7 @@ import org.apache.slider.test.YarnZKMiniClusterTestBase
import org.apache.zookeeper.CreateMode
import org.apache.zookeeper.ZooDefs
import org.apache.zookeeper.data.Stat
+import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -38,32 +41,46 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
// as the static compiler doesn't resolve consistently
public static final String USER = KeysForTests.USERNAME
+ private ZKIntegration zki
@Before
void createCluster() {
Configuration conf = configuration
- createMicroZKCluster(methodName.methodName, conf)
+ def name = methodName.methodName
+ File zkdir = new File("target/zk/${name}")
+ FileUtil.fullyDelete(zkdir);
+ conf.set(MicroZookeeperServiceKeys.KEY_ZKSERVICE_DIR, zkdir.absolutePath)
+ createMicroZKCluster("-"+ name, conf)
+ }
+
+ @After
+ void closeZKI() {
+ zki?.close()
+ zki = null;
}
@Test
public void testIntegrationCreate() throws Throwable {
assertHasZKCluster()
- ZKIntegration zki = createZKIntegrationInstance(
- getZKBinding(), "cluster1", true, false, 5000)
+ initZKI()
String userPath = ZKIntegration.mkSliderUserPath(USER)
Stat stat = zki.stat(userPath)
assert stat != null
log.info("User path $userPath has stat $stat")
}
+ public ZKIntegration initZKI() {
+ zki = createZKIntegrationInstance(
+ getZKBinding(), methodName.methodName, true, false, 5000)
+ return zki
+ }
+
@Test
public void testListUserClustersWithoutAnyClusters() throws Throwable {
assertHasZKCluster()
-
- ZKIntegration zki = createZKIntegrationInstance(
- getZKBinding(), "", true, false, 5000)
+ initZKI()
String userPath = ZKIntegration.mkSliderUserPath(USER)
- List<String> clusters = zki.clusters
+ List<String> clusters = this.zki.clusters
assert clusters.empty
}
@@ -71,8 +88,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
public void testListUserClustersWithOneCluster() throws Throwable {
assertHasZKCluster()
- ZKIntegration zki = createZKIntegrationInstance(
- getZKBinding(), methodName.methodName, true, false, 5000)
+ initZKI()
String userPath = ZKIntegration.mkSliderUserPath(USER)
String fullPath = zki.createPath(userPath, "/cluster-",
ZooDefs.Ids.OPEN_ACL_UNSAFE,
@@ -85,8 +101,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
@Test
public void testListUserClustersWithTwoCluster() throws Throwable {
- ZKIntegration zki = createZKIntegrationInstance(
- getZKBinding(), methodName.methodName, true, false, 5000)
+ initZKI()
String userPath = ZKIntegration.mkSliderUserPath(USER)
String c1 = createEphemeralChild(zki, userPath)
log.info("Ephemeral path $c1")
@@ -103,7 +118,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
MockSliderClient client = new MockSliderClient()
String path = client.createZookeeperNode("cl1", true)
- ZKIntegration zki = client.lastZKIntegration
+ zki = client.lastZKIntegration
String zkPath = ZKIntegration.mkClusterPath(USER, "cl1")
assert zkPath == "/services/slider/users/" + USER + "/cl1", "zkPath must be as expected"
@@ -140,7 +155,7 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest
@Override
protected ZKIntegration getZkClient(String clusterName, String user) {
- zki = createZKIntegrationInstance(getZKBinding(), "cl1", true, false, 5000)
+ zki = createZKIntegrationInstance(getZKBinding(), clusterName, true, false, 5000)
return zki;
}
[32/50] incubator-slider git commit: SLIDER-622 spin for deletion
Posted by el...@apache.org.
SLIDER-622 spin for deletion
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/75963870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/75963870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/75963870
Branch: refs/heads/master
Commit: 7596387040446aa8bac157f09fc028fe4b699981
Parents: 632346e
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 13:50:59 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:47 2014 +0000
----------------------------------------------------------------------
.../slider/test/YarnMiniClusterTestBase.groovy | 32 +++++++++++++++++---
1 file changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/75963870/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index dde8239..0850d25 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -18,7 +18,6 @@
package org.apache.slider.test
-import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.commons.logging.Log
import org.apache.commons.logging.LogFactory
@@ -493,10 +492,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
log.info("deleting customer data at $clusterDir")
//this is a safety check to stop us doing something stupid like deleting /
assert clusterDir.toString().contains("/.slider/")
- dfs.delete(clusterDir, true)
- sleep(1000)
- dfs.delete(clusterDir, true)
- assert !dfs.exists(clusterDir), "delete operation failed —application in use?"
+ rigorousDelete(dfs, clusterDir, 60000)
}
@@ -544,6 +540,32 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
}
/**
+ * Delete with some pauses and backoff; designed to handle slow delete
+ * operation in windows
+ * @param dfs
+ * @param clusterDir
+ */
+ public void rigorousDelete(
+ HadoopFS dfs, Path clusterDir, long timeout) {
+ Duration duration = new Duration(timeout)
+ duration.start()
+ boolean deleted = false;
+ while (!deleted) {
+ dfs.delete(clusterDir, true)
+ deleted = !dfs.exists(clusterDir)
+ if (!deleted ) {
+ if (duration.limitExceeded) {
+ assert !dfs.exists(
+ clusterDir), "delete operation failed —directory in use?"
+
+ }
+ sleep(1000)
+ }
+
+ }
+ }
+
+ /**
* Add arguments to launch Slider with.
*
* Extra arguments are added after standard arguments and before roles.
[05/50] incubator-slider git commit: SLIDER-622 simplify check for
kill by just disabling it on windows test runs
Posted by el...@apache.org.
SLIDER-622 simplify check for kill by just disabling it on windows test runs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/90f6dd81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/90f6dd81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/90f6dd81
Branch: refs/heads/master
Commit: 90f6dd815a70d09dd9717f9fb9af1a7559165484
Parents: 00cf306
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 21:00:24 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90f6dd81/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index 88fac06..96b1aae 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -210,11 +210,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
*/
@BeforeClass
public static void checkKillSupport() {
- if (!Shell.WINDOWS) {
- kill_supported = true;
- } else {
- kill_supported = doesWindowsAppExist(["xargs", "--version"])
- }
+ kill_supported = !Shell.WINDOWS
}
/**
[28/50] incubator-slider git commit: SLIDER-637 purge ZKInstance uses
in the accumulo and hbase providers
Posted by el...@apache.org.
SLIDER-637 purge ZKInstance uses in the accumulo and hbase providers
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/62c87ec9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/62c87ec9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/62c87ec9
Branch: refs/heads/master
Commit: 62c87ec98dee5f0755dd54ca8f8918e461adc3b3
Parents: d556971
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 13:33:39 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:36 2014 +0000
----------------------------------------------------------------------
.../live/TestAccCorrectInstanceName.groovy | 17 +++--------------
.../accumulo/live/TestAccFreezeThaw.groovy | 6 +-----
.../accumulo/live/TestAccLiveHDFSArchive.groovy | 8 ++------
.../accumulo/live/TestAccLiveLocalArchive.groovy | 8 ++------
.../accumulo/live/TestAccM1T1GC1Mon1.groovy | 8 ++------
.../accumulo/live/TestAccM2T2GC1Mon1.groovy | 8 ++------
.../accumulo/live/TestAccumuloAMWebApp.groovy | 10 +++-------
.../accumulo/live/TestInvalidMonitorAddress.groovy | 10 +++++-----
.../hbase/minicluster/live/Test2Master2RS.groovy | 6 +++---
.../hbase/minicluster/live/TestHBaseMaster.groovy | 11 ++++-------
.../minicluster/live/TestHBaseMasterOnHDFS.groovy | 2 +-
.../live/TestLiveRegionServiceOnHDFS.groovy | 5 +----
.../live/TestLiveTwoNodeRegionService.groovy | 6 +++---
.../minicluster/live/TestTwoLiveClusters.groovy | 6 +++---
14 files changed, 35 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy
index 2333fdf..1f1b726 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy
@@ -20,17 +20,13 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
-import org.apache.accumulo.core.client.Connector
-import org.apache.accumulo.core.client.ZooKeeperInstance
-import org.apache.accumulo.core.client.security.tokens.PasswordToken
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
-import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.common.params.Arguments
import org.apache.slider.client.SliderClient
+import org.apache.slider.common.params.Arguments
+import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.accumulo.AccumuloKeys
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -47,8 +43,6 @@ class TestAccCorrectInstanceName extends AccumuloTestBase {
describe(" Create an accumulo cluster");
//make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
@@ -79,11 +73,6 @@ class TestAccCorrectInstanceName extends AccumuloTestBase {
//verify that all is still there
waitForRoleCount(sliderClient, roles, 0)
- // Making the connector validates that the instance name is correct, we have the right zk,
- // and the proper username and password were created in accumulo
- ZooKeeperInstance instance = new ZooKeeperInstance(System.getProperty("user.name") + "-" + clustername, zki.getConnectionString());
- Connector c = instance.getConnector("root", new PasswordToken(password));
-
log.info("Finishing")
status = sliderClient.getClusterDescription(clustername)
log.info(prettyPrint(status.toJsonString()))
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
index fcb73e0..f55b73e 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy
@@ -21,12 +21,11 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus
+import org.apache.slider.client.SliderClient
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions
import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -42,9 +41,6 @@ class TestAccFreezeThaw extends AccumuloTestBase {
configuration, 1, 1, 1, true, false)
describe(" Create an accumulo cluster");
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy
index 8d5890c..ecb9062 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy
@@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
+import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions
import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -44,9 +43,6 @@ class TestAccLiveHDFSArchive extends AccumuloTestBase {
describe(" Create an accumulo cluster from an archive");
enableTestRunAgainstUploadedArchive();
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy
index df0bbd9..997fa19 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy
@@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
+import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions
import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -46,9 +45,6 @@ class TestAccLiveLocalArchive extends AccumuloTestBase {
//image mode
switchToImageDeploy = true
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy
index d94eb36..586c4c0 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy
@@ -21,12 +21,11 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
-import org.apache.slider.providers.accumulo.AccumuloKeys
import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.accumulo.AccumuloKeys
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -41,9 +40,6 @@ class TestAccM1T1GC1Mon1 extends AccumuloTestBase {
String clustername = createMiniCluster( "", configuration, 1, 1, 1, true, false)
describe(" Create an accumulo cluster");
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy
index 2ed50f1..804d29d 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy
@@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
+import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions
import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
import org.junit.Test
@CompileStatic
@@ -44,9 +43,6 @@ class TestAccM2T2GC1Mon1 extends AccumuloTestBase {
"", configuration, 1, 1, 1, true, false)
describe(" Create an accumulo cluster");
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): master,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy
index 4596b12..7afcd0f 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy
@@ -22,14 +22,13 @@ import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
+import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions
import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.server.appmaster.web.SliderAMWebApp
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.accumulo.AccumuloTestBase
-import org.apache.slider.core.zk.ZKIntegration
+import org.apache.slider.server.appmaster.web.SliderAMWebApp
import org.junit.Test
@CompileStatic
@@ -45,9 +44,6 @@ class TestAccumuloAMWebApp extends AccumuloTestBase {
configuration, 1, 1, 1, true, false)
describe(" Create an accumulo cluster");
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
- log.info("ZK up at $zki");
//now launch the cluster
Map<String, Integer> roles = [
(AccumuloKeys.ROLE_MASTER): 1,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy
index dca0c6b..a07ddc9 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy
@@ -20,14 +20,14 @@ package org.apache.slider.providers.accumulo.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
-import org.apache.slider.core.main.ServiceLaunchException
-import org.apache.slider.core.main.ServiceLauncher
-import org.apache.slider.common.SliderExitCodes
import org.apache.slider.api.ClusterDescription
import org.apache.slider.api.RoleKeys
-import org.apache.slider.providers.accumulo.AccumuloKeys
-import org.apache.slider.common.params.Arguments
import org.apache.slider.client.SliderClient
+import org.apache.slider.common.SliderExitCodes
+import org.apache.slider.common.params.Arguments
+import org.apache.slider.core.main.ServiceLaunchException
+import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.accumulo.AccumuloKeys
import org.apache.slider.providers.accumulo.AccumuloTestBase
import org.junit.Test
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy
index 47f5e1c..10a502b 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy
@@ -22,11 +22,11 @@ import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.hbase.ClusterStatus
-import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.api.ClusterDescription
-import org.apache.slider.providers.hbase.HBaseTestUtils
-import org.apache.slider.common.tools.Duration
import org.apache.slider.client.SliderClient
+import org.apache.slider.common.tools.Duration
+import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.hbase.HBaseTestUtils
import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy
index 79193c3..db102cb 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy
@@ -23,17 +23,16 @@ import groovy.util.logging.Slf4j
import org.apache.hadoop.registry.client.binding.RegistryUtils
import org.apache.hadoop.registry.client.types.ServiceRecord
import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes
-import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.api.ClusterDescription
import org.apache.slider.api.RoleKeys
+import org.apache.slider.client.SliderClient
+import org.apache.slider.common.SliderXmlConfKeys
+import org.apache.slider.common.params.Arguments
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.registry.docstore.PublishedConfigSet
import org.apache.slider.core.registry.retrieve.RegistryRetriever
import org.apache.slider.providers.hbase.HBaseKeys
-import org.apache.slider.core.zk.ZKIntegration
-import org.apache.slider.common.params.Arguments
-import org.apache.slider.client.SliderClient
import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
-import org.apache.slider.core.main.ServiceLauncher
import org.junit.Test
/**
@@ -47,8 +46,6 @@ class TestHBaseMaster extends HBaseMiniClusterTestBase {
@Test
public void testHBaseMaster() throws Throwable {
String clustername = createMiniCluster("", configuration, 1, true)
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
//now launch the cluster with 1 region server
int regionServerCount = 1
ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy
index 7f51f95..5e8adca 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy
@@ -22,8 +22,8 @@ import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.slider.api.ClusterDescription
import org.apache.slider.client.SliderClient
-import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy
index 957d167..1392535 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy
@@ -22,10 +22,9 @@ import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.hbase.ClusterStatus
import org.apache.slider.api.ClusterDescription
-import org.apache.slider.core.zk.ZKIntegration
import org.apache.slider.client.SliderClient
-import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
/**
@@ -42,8 +41,6 @@ class TestLiveRegionServiceOnHDFS extends HBaseMiniClusterTestBase {
"", configuration, 1, 1, 1, true, true)
describe(" Create a single region service cluster");
- //make sure that ZK is up and running at the binding string
- ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000)
//now launch the cluster
ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
SliderClient sliderClient = launcher.service
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy
index 3561d2f..f10e296 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy
@@ -23,11 +23,11 @@ import groovy.util.logging.Slf4j
import org.apache.hadoop.hbase.ClusterStatus
import org.apache.slider.api.ClusterDescription
import org.apache.slider.api.RoleKeys
-import org.apache.slider.providers.hbase.HBaseKeys
-import org.apache.slider.common.params.Arguments
import org.apache.slider.client.SliderClient
-import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
+import org.apache.slider.common.params.Arguments
import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.providers.hbase.HBaseKeys
+import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
index b7212d9..029f424 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
@@ -21,15 +21,15 @@ package org.apache.slider.providers.hbase.minicluster.live
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.registry.client.api.RegistryOperations
-import org.apache.hadoop.registry.client.binding.RegistryUtils
import org.apache.hadoop.registry.client.binding.RegistryPathUtils
+import org.apache.hadoop.registry.client.binding.RegistryUtils
import org.apache.hadoop.registry.client.types.ServiceRecord
+import org.apache.slider.client.SliderClient
import org.apache.slider.common.SliderKeys
import org.apache.slider.common.params.Arguments
-import org.apache.slider.client.SliderClient
+import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.providers.hbase.HBaseKeys
import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
-import org.apache.slider.core.main.ServiceLauncher
import org.junit.Test
@CompileStatic
[09/50] incubator-slider git commit: SLIDER-622 moved exec operations
Posted by el...@apache.org.
SLIDER-622 moved exec operations
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/75e6efc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/75e6efc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/75e6efc0
Branch: refs/heads/master
Commit: 75e6efc025962cea8c819c117607d2f0208ce532
Parents: f2e63f6
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 17:50:12 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
.../apache/slider/test/SliderTestUtils.groovy | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/75e6efc0/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index 634b6b5..8d6c036 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -28,6 +28,7 @@ import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.FileStatus
import org.apache.hadoop.fs.FileSystem as HadoopFS
import org.apache.hadoop.fs.Path
+import org.apache.hadoop.service.ServiceStateException
import org.apache.hadoop.util.Shell
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.conf.YarnConfiguration
@@ -46,6 +47,7 @@ import org.apache.slider.core.exceptions.WaitTimeoutException
import org.apache.slider.core.main.ServiceLaunchException
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.registry.docstore.PublishedConfigSet
+import org.apache.slider.server.services.workflow.ForkedProcessService
import org.junit.Assert
import org.junit.Assume
@@ -520,6 +522,45 @@ class SliderTestUtils extends Assert {
int actual = instances != null ? instances.size() : 0
return actual
}
+ /**
+ * Exec a set of commands, wait a few seconds for it to finish.
+ * @param status code
+ * @param commands
+ * @return the process
+ */
+ public static ForkedProcessService exec(int status, List<String> commands) {
+ ForkedProcessService process = exec(commands)
+ assert status == process.exitCode
+ return process
+ }
+ /**
+ * Exec a set of commands, wait a few seconds for it to finish.
+ * @param commands
+ * @return
+ */
+ public static ForkedProcessService exec(List<String> commands) {
+ ForkedProcessService process;
+ process = new ForkedProcessService(
+ commands[0],
+ [:],
+ commands);
+ process.init(new Configuration());
+ process.start();
+ process.waitForServiceToStop(10000);
+ process
+ }
+
+ public static boolean doesWindowsAppExist(List<String> commands) {
+ try {
+ exec(0, commands)
+ return true;
+ } catch (ServiceStateException e) {
+ if (!(e.cause instanceof FileNotFoundException)) {
+ throw e;
+ }
+ return false;
+ }
+ }
/**
* Execute a closure, assert it fails with a given exit code and text
[31/50] incubator-slider git commit: SLIDER-622 bypass Haddop APIs
and go to commons IO directory delete if the path is file://
Posted by el...@apache.org.
SLIDER-622 bypass Haddop APIs and go to commons IO directory delete if the path is file://
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f5324897
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f5324897
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f5324897
Branch: refs/heads/master
Commit: f5324897d1649f79db9775b2f917282edfb9c810
Parents: 5afa9b3
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 14:37:28 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:04:47 2014 +0000
----------------------------------------------------------------------
.../slider/test/YarnMiniClusterTestBase.groovy | 38 +++++++++++++++++---
1 file changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f5324897/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index ffd3dab..326c217 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -19,6 +19,7 @@
package org.apache.slider.test
import groovy.util.logging.Slf4j
+import org.apache.commons.io.FileUtils
import org.apache.commons.logging.Log
import org.apache.commons.logging.LogFactory
import org.apache.hadoop.conf.Configuration
@@ -550,18 +551,47 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
public void rigorousDelete(
SliderFileSystem sliderFileSystem,
Path path, long timeout) {
+
+ if (path.toUri().scheme == "file") {
+ File dir = new File(path.toUri().getPath());
+ rigorousDelete(dir, timeout)
+ } else {
+ Duration duration = new Duration(timeout)
+ duration.start()
+ HadoopFS dfs = sliderFileSystem.fileSystem
+ boolean deleted = false;
+ while (!deleted && !duration.limitExceeded) {
+ dfs.delete(path, true)
+ deleted = !dfs.exists(path)
+ if (!deleted) {
+ sleep(1000)
+ }
+ }
+ }
+ sliderFileSystem.verifyDirectoryNonexistent(path)
+ }
+
+ /**
+ * Delete with some pauses and backoff; designed to handle slow delete
+ * operation in windows
+ * @param dir dir to delete
+ * @param timeout timeout in millis
+ */
+ public void rigorousDelete(File dir, long timeout) {
Duration duration = new Duration(timeout)
duration.start()
- HadoopFS dfs = sliderFileSystem.fileSystem
boolean deleted = false;
while (!deleted && !duration.limitExceeded) {
- dfs.delete(path, true)
- deleted = !dfs.exists(path)
+ FileUtils.deleteQuietly(dir)
+ deleted = !dir.exists()
if (!deleted) {
sleep(1000)
}
}
- sliderFileSystem.verifyDirectoryNonexistent(path)
+ if (!deleted) {
+ // noisy delete raises an IOE
+ FileUtils.deleteDirectory(dir)
+ }
}
/**
[16/50] incubator-slider git commit: SLIDER-622 :
TestStandaloneYarnRegistryAM - fix ZK instance separation problems (windows
doesn't to rmdir while cluster is in use)
Posted by el...@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/d84f83c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d84f83c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d84f83c0
Branch: refs/heads/master
Commit: d84f83c0ee897a1ea7d40a66ef07200e5f0926ee
Parents: ee4fec7
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 22:48:10 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/d84f83c0/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,
[35/50] incubator-slider git commit: SLIDER-623 wrapping 2.4
incompatible print statment in try except
Posted by el...@apache.org.
SLIDER-623 wrapping 2.4 incompatible print statment in try except
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4039ec56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4039ec56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4039ec56
Branch: refs/heads/master
Commit: 4039ec56fafbb1869d7aad6fa1179cb51d7bde56
Parents: 010127a
Author: Jon Maron <jm...@hortonworks.com>
Authored: Tue Nov 11 12:37:33 2014 -0500
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Tue Nov 11 12:39:39 2014 -0500
----------------------------------------------------------------------
slider-core/src/test/python/agent/main.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4039ec56/slider-core/src/test/python/agent/main.py
----------------------------------------------------------------------
diff --git a/slider-core/src/test/python/agent/main.py b/slider-core/src/test/python/agent/main.py
index e50642d..116d179 100755
--- a/slider-core/src/test/python/agent/main.py
+++ b/slider-core/src/test/python/agent/main.py
@@ -27,7 +27,10 @@ import os
def main():
print "Executing echo"
- print 'Argument List: {0}'.format(str(sys.argv))
+ try:
+ print 'Argument List: {0}'.format(str(sys.argv))
+ except AttributeError:
+ pass
parser = OptionParser()
parser.add_option("--log", dest="log_folder", help="log destination")
[36/50] incubator-slider git commit: SLIDER-640: switch build to
hadoop-2.6.0
Posted by el...@apache.org.
SLIDER-640: switch build to hadoop-2.6.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d1441e39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d1441e39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d1441e39
Branch: refs/heads/master
Commit: d1441e391360ed59b5e80edd393a3450aa02be68
Parents: 4039ec5
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 17:27:51 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 19:39:35 2014 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d1441e39/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f11641f..6a5e6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
<!--
core artifacts
-->
- <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
+ <hadoop.version>2.6.0</hadoop.version>
<hbase.version>0.98.4-hadoop2</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
[07/50] incubator-slider git commit: SLIDER-622 trying to automate
adding path
Posted by el...@apache.org.
SLIDER-622 trying to automate adding path
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0b24aeef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0b24aeef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0b24aeef
Branch: refs/heads/master
Commit: 0b24aeef392581137b87d5f122a2f934039ee469
Parents: be5c0d7
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 10 20:12:48 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 10 22:48:09 2014 +0000
----------------------------------------------------------------------
pom.xml | 6 ++++++
slider-core/pom.xml | 3 +++
.../slider/common/tools/TestWindowsSupport.groovy | 15 +++++++++++++++
3 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b24aeef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4f8042..2689abf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,8 @@
<test.failIfNoTests>true</test.failIfNoTests>
<test.funtests.failIfNoTests>false</test.funtests.failIfNoTests>
<test.forkMode>always</test.forkMode>
+ <!-- path environment variable -->
+ <test.env.path>${env.PATH}</test.env.path>
<!--
core artifacts
@@ -1316,6 +1318,7 @@
<module>app-packages/storm</module>
</modules>
</profile>
+
<profile>
<id>Windows</id>
<activation>
@@ -1323,6 +1326,9 @@
<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>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b24aeef/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 6cf9793..5e1d8ab 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -116,6 +116,9 @@
<argLine>${test.argLine}</argLine>
<failIfNoTests>${test.failIfNoTests}</failIfNoTests>
<redirectTestOutputToFile>${build.redirect.test.output.to.file}</redirectTestOutputToFile>
+ <environmentVariables>
+ <PATH>${test.env.path}</PATH>
+ </environmentVariables>
<systemPropertyVariables>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<java.awt.headless>true</java.awt.headless>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b24aeef/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 9b383f4..cbd79a4 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -169,4 +169,19 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
exec(0, [winUtilsPath, "systeminfo"])
}
+
+ @Test
+ public void testPath() throws Throwable {
+ String pathkey;
+
+ System.getenv().keySet().each { String it ->
+ if (it.toLowerCase(Locale.ENGLISH).equals("path")) {
+ pathkey = it;
+ }
+ }
+ assert pathkey
+ log.info("Path env variable is $pathkey")
+ def pathval = System.getenv(pathkey)
+ log.info("Path value = $pathval")
+ }
}