[1/2] git commit: SLIDER-375 TestLongLivedProcess needed windows command translation
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows [created]
fbaea34f3
SLIDER-375 TestLongLivedProcess needed windows command translation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/637293a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/637293a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/637293a2
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: 637293a2164def30f076fc7195046eb67941f4b6
Parents: 4d5783e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 19:15:14 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Thu Aug 28 19:15:14 2014 +0100
--
.../workflow/ProcessCommandFactory.java | 21 ++--
.../services/workflow/TestLongLivedProcess.java | 6 ++
.../workflow/WorkflowServiceTestBase.java | 3 ++-
3 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..4a19417 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -18,8 +18,11 @@
package org.apache.slider.server.services.workflow;
+import org.apache.hadoop.util.Shell;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,10 +40,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
-commands.add(ls);
-commands.add(-1);
-commands.add(dir.getAbsolutePath());
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(ls,-1, dir.getAbsolutePath());
+} else {
+ commands = Arrays.asList(cmd, /c, dir, dir.getAbsolutePath());
+}
return commands;
}
@@ -61,8 +66,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString env() {
-ListString commands = new ArrayListString(1);
-commands.add(env);
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(env);
+} else {
+ commands = Arrays.asList(cmd, /c, set);
+}
return commands;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/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 668bcca..9019124 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
@@ -33,11 +33,9 @@ import java.util.List;
*/
public class TestLongLivedProcess extends WorkflowServiceTestBase implements
LongLivedProcessLifecycleEvent {
- private static final Logger
- log = LoggerFactory.getLogger(TestLongLivedProcess.class);
+ private static final Logger log =
LoggerFactory.getLogger(TestLongLivedProcess.class);
- private static final Logger
- processLog =
+ private static final Logger processLog =
LoggerFactory.getLogger(org.apache.hadoop.services.workflow.Process);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
index 3049d8f..f38bd9d 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
[2/6] git commit: SLIDER-258. Jenkins build continue to hang on python unit tests
SLIDER-258. Jenkins build continue to hang on python unit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8bfd66e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8bfd66e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8bfd66e8
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: 8bfd66e813635aa93a9551c121622b408d41b518
Parents: f292a16
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Thu Aug 28 15:37:31 2014 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Thu Aug 28 15:37:31 2014 -0700
--
.../src/test/python/agent/TestRegistration.py | 14 +-
slider-agent/src/test/python/unitTests.py | 1 +
2 files changed, 2 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8bfd66e8/slider-agent/src/test/python/agent/TestRegistration.py
--
diff --git a/slider-agent/src/test/python/agent/TestRegistration.py
b/slider-agent/src/test/python/agent/TestRegistration.py
index f91fe29..7b3c875 100644
--- a/slider-agent/src/test/python/agent/TestRegistration.py
+++ b/slider-agent/src/test/python/agent/TestRegistration.py
@@ -37,15 +37,6 @@ class TestRegistration(TestCase):
config = AgentConfig(tmpdir, ver_dir)
config.set('agent', 'prefix', tmpdir)
config.set('agent', 'current_ping_port', '33777')
-try:
- os.mkdir(ver_dir)
-except OSError as exception:
- if exception.errno != errno.EEXIST:
-raise
-pass
-ver_file = os.path.join(ver_dir, version)
-with open(ver_file, w) as text_file:
- text_file.write(1.3.0)
register = Register(config)
data = register.build(State.INIT, State.INIT, {}, 1)
@@ -54,7 +45,7 @@ class TestRegistration(TestCase):
self.assertEquals(data['publicHostname'] != , True, publicHostname
should not be empty)
self.assertEquals(data['responseId'], 1)
self.assertEquals(data['timestamp'] 1353678475465L, True, timestamp
should not be empty)
-self.assertEquals(data['agentVersion'], '1.3.0', agentVersion should not
be empty)
+self.assertEquals(data['agentVersion'], '1', agentVersion should not be
empty)
self.assertEquals(data['actualState'], State.INIT, actualState should not
be empty)
self.assertEquals(data['expectedState'], State.INIT, expectedState should
not be empty)
self.assertEquals(data['allocatedPorts'], {}, allocatedPorts should be
empty)
@@ -66,8 +57,5 @@ class TestRegistration(TestCase):
self.assertEquals(os.path.join(ver_dir, .),
config.getResolvedPath(log_dir))
self.assertEquals(os.path.join(ver_dir, .),
config.getResolvedPath(app_task_dir))
-os.remove(ver_file)
-os.removedirs(ver_dir)
-
if __name__ == __main__:
unittest.main()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8bfd66e8/slider-agent/src/test/python/unitTests.py
--
diff --git a/slider-agent/src/test/python/unitTests.py
b/slider-agent/src/test/python/unitTests.py
index e3f2d7c..b01438e 100644
--- a/slider-agent/src/test/python/unitTests.py
+++ b/slider-agent/src/test/python/unitTests.py
@@ -56,6 +56,7 @@ def all_tests_suite():
files_list += os.listdir(src_dir + os.sep + directory)
## temporarily deleting to add more predictability
## shuffle(files_list)
+ files_list.sort()
tests_list = []
logger.info('TESTS
LIST:-')
[6/6] git commit: SLIDER-375 path fixup for windows
SLIDER-375 path fixup 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/aceab6ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aceab6ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aceab6ba
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: aceab6ba942fb5e6c338570e030b4e09dce609eb
Parents: 26ec0d0
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:42:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 8 +---
.../apache/slider/providers/agent/TestAgentEcho.groovy| 6 +++---
.../registry/curator/TestRegistryRestResources.groovy | 6 +++---
.../web/rest/publisher/TestPublisherRestResources.groovy | 10 +++---
.../groovy/org/apache/slider/test/SliderTestUtils.groovy | 9 +
5 files changed, 23 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 4e7b5b9..6720bda 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
],
true, true,
true)
@@ -163,4 +163,6 @@ class TestAgentAMManagementWS extends AgentTestBase {
assert RegistrationStatus.FAILED == response.getResponseStatus();
}
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
index a29c8cb..a7b5fe3 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
@@ -72,9 +72,9 @@ class TestAgentEcho extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
ARG_RES_COMP_OPT, role, ResourceKeys.COMPONENT_PRIORITY, 1,
ARG_COMP_OPT, role, SCRIPT_PATH, echo_py,
ARG_COMP_OPT, role, SERVICE_NAME, Agent,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
index 1a1e5aa..0b77adc 100644
---
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
@@ -88,9 +88,9 @@ class TestRegistryRestResources extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION,
[5/6] git commit: SLIDER-375 test getting its args wrong on windows
SLIDER-375 test getting its args wrong on 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/26ec0d08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26ec0d08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26ec0d08
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: 26ec0d084a16a7a6c5d27f946fa48451047263aa
Parents: c40e480
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:25:19 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/26ec0d08/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 1cd8de6..4e7b5b9 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
],
true, true,
true)
[4/6] git commit: SLIDER-375 TestLongLivedProcess needed windows command translation
SLIDER-375 TestLongLivedProcess needed windows command translation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6797222c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6797222c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6797222c
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: 6797222c92b887ffadb066251b5886787bb4cf44
Parents: 8bfd66e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 19:15:14 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../workflow/ProcessCommandFactory.java | 21 ++--
.../services/workflow/TestLongLivedProcess.java | 6 ++
.../workflow/WorkflowServiceTestBase.java | 3 ++-
3 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..4a19417 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -18,8 +18,11 @@
package org.apache.slider.server.services.workflow;
+import org.apache.hadoop.util.Shell;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,10 +40,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
-commands.add(ls);
-commands.add(-1);
-commands.add(dir.getAbsolutePath());
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(ls,-1, dir.getAbsolutePath());
+} else {
+ commands = Arrays.asList(cmd, /c, dir, dir.getAbsolutePath());
+}
return commands;
}
@@ -61,8 +66,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString env() {
-ListString commands = new ArrayListString(1);
-commands.add(env);
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(env);
+} else {
+ commands = Arrays.asList(cmd, /c, set);
+}
return commands;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/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 668bcca..9019124 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
@@ -33,11 +33,9 @@ import java.util.List;
*/
public class TestLongLivedProcess extends WorkflowServiceTestBase implements
LongLivedProcessLifecycleEvent {
- private static final Logger
- log = LoggerFactory.getLogger(TestLongLivedProcess.class);
+ private static final Logger log =
LoggerFactory.getLogger(TestLongLivedProcess.class);
- private static final Logger
- processLog =
+ private static final Logger processLog =
LoggerFactory.getLogger(org.apache.hadoop.services.workflow.Process);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
index 3049d8f..f38bd9d 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.Callable;
/**
@@ -122,7 +123,7 @@ public abstract class WorkflowServiceTestBase
[3/6] git commit: SLIDER-375 skip bits of TestPublisherURIs on windows
SLIDER-375 skip bits of TestPublisherURIs on 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/c40e480e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c40e480e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c40e480e
Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows
Commit: c40e480e32d647451a87a80dcba01533b99c0d4f
Parents: 6797222
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:16:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../publisher/TestPublisherRestResources.groovy | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c40e480e/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index 21881be..0f2014d 100644
---
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -23,6 +23,7 @@ import com.sun.jersey.api.client.ClientResponse
import com.sun.jersey.api.client.WebResource
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
+import org.apache.hadoop.util.Shell
import org.apache.slider.api.StatusKeys
import org.apache.slider.client.SliderClient
import org.apache.slider.core.main.ServiceLauncher
@@ -134,13 +135,14 @@ class TestPublisherRestResources extends AgentTestBase {
Set uris = webResource.type(MediaType.APPLICATION_JSON)
.get(Set.class)
assert uris.size() 0
-log.info(Classpath URIs: {}, uris)
-// check for some expected classpath elements
-assert uris.any {it =~ /curator-x-discovery/}
-assert uris.any {it =~ /hadoop-yarn-api/}
-assert uris.any {it =~ /hadoop-hdfs/}
-// and a negative test...
-assert !uris.any {it =~ /foo-bar/}
+if (!Shell.WINDOWS) {
+ log.info(Classpath URIs: {}, uris)
+ // check for some expected classpath elements
+ assert uris.any {it =~ /hadoop-yarn-api/}
+ assert uris.any {it =~ /hadoop-hdfs/}
+ // and a negative test...
+ assert !uris.any {it =~ /foo-bar/}
+}
}
public String toFileURI(File filename) {
[3/5] git commit: SLIDER-375 test getting its args wrong on windows
SLIDER-375 test getting its args wrong on 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/26ec0d08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26ec0d08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26ec0d08
Branch: refs/heads/develop
Commit: 26ec0d084a16a7a6c5d27f946fa48451047263aa
Parents: c40e480
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:25:19 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/26ec0d08/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 1cd8de6..4e7b5b9 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
],
true, true,
true)
[1/5] git commit: SLIDER-375 skip bits of TestPublisherURIs on windows
Repository: incubator-slider
Updated Branches:
refs/heads/develop 8bfd66e81 - c91d5ecd3
SLIDER-375 skip bits of TestPublisherURIs on 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/c40e480e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c40e480e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c40e480e
Branch: refs/heads/develop
Commit: c40e480e32d647451a87a80dcba01533b99c0d4f
Parents: 6797222
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:16:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../publisher/TestPublisherRestResources.groovy | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c40e480e/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index 21881be..0f2014d 100644
---
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -23,6 +23,7 @@ import com.sun.jersey.api.client.ClientResponse
import com.sun.jersey.api.client.WebResource
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
+import org.apache.hadoop.util.Shell
import org.apache.slider.api.StatusKeys
import org.apache.slider.client.SliderClient
import org.apache.slider.core.main.ServiceLauncher
@@ -134,13 +135,14 @@ class TestPublisherRestResources extends AgentTestBase {
Set uris = webResource.type(MediaType.APPLICATION_JSON)
.get(Set.class)
assert uris.size() 0
-log.info(Classpath URIs: {}, uris)
-// check for some expected classpath elements
-assert uris.any {it =~ /curator-x-discovery/}
-assert uris.any {it =~ /hadoop-yarn-api/}
-assert uris.any {it =~ /hadoop-hdfs/}
-// and a negative test...
-assert !uris.any {it =~ /foo-bar/}
+if (!Shell.WINDOWS) {
+ log.info(Classpath URIs: {}, uris)
+ // check for some expected classpath elements
+ assert uris.any {it =~ /hadoop-yarn-api/}
+ assert uris.any {it =~ /hadoop-hdfs/}
+ // and a negative test...
+ assert !uris.any {it =~ /foo-bar/}
+}
}
public String toFileURI(File filename) {
[4/5] git commit: SLIDER-375 path fixup for windows
SLIDER-375 path fixup 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/aceab6ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aceab6ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aceab6ba
Branch: refs/heads/develop
Commit: aceab6ba942fb5e6c338570e030b4e09dce609eb
Parents: 26ec0d0
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:42:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 8 +---
.../apache/slider/providers/agent/TestAgentEcho.groovy| 6 +++---
.../registry/curator/TestRegistryRestResources.groovy | 6 +++---
.../web/rest/publisher/TestPublisherRestResources.groovy | 10 +++---
.../groovy/org/apache/slider/test/SliderTestUtils.groovy | 9 +
5 files changed, 23 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 4e7b5b9..6720bda 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
],
true, true,
true)
@@ -163,4 +163,6 @@ class TestAgentAMManagementWS extends AgentTestBase {
assert RegistrationStatus.FAILED == response.getResponseStatus();
}
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
index a29c8cb..a7b5fe3 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
@@ -72,9 +72,9 @@ class TestAgentEcho extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
ARG_RES_COMP_OPT, role, ResourceKeys.COMPONENT_PRIORITY, 1,
ARG_COMP_OPT, role, SCRIPT_PATH, echo_py,
ARG_COMP_OPT, role, SERVICE_NAME, Agent,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
index 1a1e5aa..0b77adc 100644
---
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
@@ -88,9 +88,9 @@ class TestRegistryRestResources extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// +
[2/5] git commit: SLIDER-375 TestLongLivedProcess needed windows command translation
SLIDER-375 TestLongLivedProcess needed windows command translation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6797222c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6797222c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6797222c
Branch: refs/heads/develop
Commit: 6797222c92b887ffadb066251b5886787bb4cf44
Parents: 8bfd66e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 19:15:14 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../workflow/ProcessCommandFactory.java | 21 ++--
.../services/workflow/TestLongLivedProcess.java | 6 ++
.../workflow/WorkflowServiceTestBase.java | 3 ++-
3 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..4a19417 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -18,8 +18,11 @@
package org.apache.slider.server.services.workflow;
+import org.apache.hadoop.util.Shell;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,10 +40,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
-commands.add(ls);
-commands.add(-1);
-commands.add(dir.getAbsolutePath());
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(ls,-1, dir.getAbsolutePath());
+} else {
+ commands = Arrays.asList(cmd, /c, dir, dir.getAbsolutePath());
+}
return commands;
}
@@ -61,8 +66,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString env() {
-ListString commands = new ArrayListString(1);
-commands.add(env);
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(env);
+} else {
+ commands = Arrays.asList(cmd, /c, set);
+}
return commands;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/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 668bcca..9019124 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
@@ -33,11 +33,9 @@ import java.util.List;
*/
public class TestLongLivedProcess extends WorkflowServiceTestBase implements
LongLivedProcessLifecycleEvent {
- private static final Logger
- log = LoggerFactory.getLogger(TestLongLivedProcess.class);
+ private static final Logger log =
LoggerFactory.getLogger(TestLongLivedProcess.class);
- private static final Logger
- processLog =
+ private static final Logger processLog =
LoggerFactory.getLogger(org.apache.hadoop.services.workflow.Process);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
index 3049d8f..f38bd9d 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.Callable;
/**
@@ -122,7 +123,7 @@ public abstract class WorkflowServiceTestBase extends
Assert {
boolean found = false;
[18/21] git commit: SLIDER-375 test getting its args wrong on windows
SLIDER-375 test getting its args wrong on 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/26ec0d08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26ec0d08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26ec0d08
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 26ec0d084a16a7a6c5d27f946fa48451047263aa
Parents: c40e480
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:25:19 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/26ec0d08/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 1cd8de6..4e7b5b9 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
+ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
],
true, true,
true)
[17/21] git commit: SLIDER-375 path fixup for windows
SLIDER-375 path fixup 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/aceab6ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aceab6ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aceab6ba
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: aceab6ba942fb5e6c338570e030b4e09dce609eb
Parents: 26ec0d0
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 12:42:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:19:00 2014 +0100
--
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 8 +---
.../apache/slider/providers/agent/TestAgentEcho.groovy| 6 +++---
.../registry/curator/TestRegistryRestResources.groovy | 6 +++---
.../web/rest/publisher/TestPublisherRestResources.groovy | 10 +++---
.../groovy/org/apache/slider/test/SliderTestUtils.groovy | 9 +
5 files changed, 23 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 4e7b5b9..6720bda 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -117,9 +117,9 @@ class TestAgentAMManagementWS extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, app_def_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_CONF,
agt_conf_path.absoluteFile.toURI().toString(),
-ARG_OPTION, AGENT_VERSION,
agt_ver_path.absoluteFile.toURI().toString(),
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
],
true, true,
true)
@@ -163,4 +163,6 @@ class TestAgentAMManagementWS extends AgentTestBase {
assert RegistrationStatus.FAILED == response.getResponseStatus();
}
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
index a29c8cb..a7b5fe3 100644
---
a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentEcho.groovy
@@ -72,9 +72,9 @@ class TestAgentEcho extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, file:// + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, file:// + agt_ver_path.absolutePath,
+ARG_OPTION, APP_DEF, toURIArg(app_def_path),
+ARG_OPTION, AGENT_CONF, toURIArg(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toURIArg(agt_ver_path),
ARG_RES_COMP_OPT, role, ResourceKeys.COMPONENT_PRIORITY, 1,
ARG_COMP_OPT, role, SCRIPT_PATH, echo_py,
ARG_COMP_OPT, role, SERVICE_NAME, Agent,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aceab6ba/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
index 1a1e5aa..0b77adc 100644
---
a/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/registry/curator/TestRegistryRestResources.groovy
@@ -88,9 +88,9 @@ class TestRegistryRestResources extends AgentTestBase {
roles,
[
ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, file:// + app_def_path.absolutePath,
-ARG_OPTION,
[10/21] git commit: SLIDER-369 keep accumulo ssl tests from erroring when jks files already exist
SLIDER-369 keep accumulo ssl tests from erroring when jks files already exist
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b336c576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b336c576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b336c576
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: b336c576f53136ed6175dcb94402abcfb0942885
Parents: 0c4fb57
Author: Billie Rinaldi billie.rina...@gmail.com
Authored: Thu Aug 28 08:33:54 2014 -0700
Committer: Billie Rinaldi billie.rina...@gmail.com
Committed: Thu Aug 28 08:33:54 2014 -0700
--
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 28
1 file changed, 17 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b336c576/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloSSLTestBase.groovy
--
diff --git
a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloSSLTestBase.groovy
b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloSSLTestBase.groovy
index 2818a3a..8a1b0d2 100644
---
a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloSSLTestBase.groovy
+++
b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloSSLTestBase.groovy
@@ -59,9 +59,11 @@ class AccumuloSSLTestBase extends AccumuloBasicIT {
System.out.println(provider after +provider)
File rootKeyStoreFile = new File(TEST_APP_PKG_DIR, root.jks)
-CertUtil.createRootKeyPair(rootKeyStoreFile.toString(),
- Property.INSTANCE_SECRET.toString(), trustStoreFile.toString(),
- Property.RPC_SSL_TRUSTSTORE_PASSWORD.toString(), provider);
+if (!rootKeyStoreFile.exists() !trustStoreFile.exists()) {
+ CertUtil.createRootKeyPair(rootKeyStoreFile.toString(),
+Property.INSTANCE_SECRET.toString(), trustStoreFile.toString(),
+Property.RPC_SSL_TRUSTSTORE_PASSWORD.toString(), provider);
+}
AgentUploads agentUploads = new AgentUploads(SLIDER_CONFIG)
agentUploads.uploader.copyIfOutOfDate(trustStoreFile, new Path(certDir,
@@ -69,18 +71,22 @@ class AccumuloSSLTestBase extends AccumuloBasicIT {
for (node in getNodeList(conf)) {
File keyStoreFile = new File(TEST_APP_PKG_DIR, node + .jks)
- CertUtil.createServerKeyPair(keyStoreFile.toString(),
-Property.RPC_SSL_KEYSTORE_PASSWORD.toString(),
-rootKeyStoreFile.toString(), Property.INSTANCE_SECRET.toString(),
-provider, node);
+ if (!keyStoreFile.exists()) {
+CertUtil.createServerKeyPair(keyStoreFile.toString(),
+ Property.RPC_SSL_KEYSTORE_PASSWORD.toString(),
+ rootKeyStoreFile.toString(), Property.INSTANCE_SECRET.toString(),
+ provider, node);
+ }
agentUploads.uploader.copyIfOutOfDate(keyStoreFile, new Path(certDir,
node + .jks), false)
}
-CertUtil.createServerKeyPair(clientKeyStoreFile.toString(),
- Property.RPC_SSL_KEYSTORE_PASSWORD.toString(),
- rootKeyStoreFile.toString(), Property.INSTANCE_SECRET.toString(),
- provider, InetAddress.getLocalHost().getHostName());
+if (!clientKeyStoreFile.exists()) {
+ CertUtil.createServerKeyPair(clientKeyStoreFile.toString(),
+Property.RPC_SSL_KEYSTORE_PASSWORD.toString(),
+rootKeyStoreFile.toString(), Property.INSTANCE_SECRET.toString(),
+provider, InetAddress.getLocalHost().getHostName());
+}
}
def getNodeList(Configuration conf) {
[03/21] git commit: SLIDER-36 remove custom IP filter from AM; mark as deprecated
SLIDER-36 remove custom IP filter from AM; mark as deprecated
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/265c4785
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/265c4785
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/265c4785
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 265c4785c9ddf7f7fc0394069ad957784d6d6abc
Parents: b126e7c
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 15:48:26 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Thu Aug 28 15:48:26 2014 +0100
--
.../src/main/java/org/apache/slider/common/SliderKeys.java | 7 +++
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 8 ++--
.../server/appmaster/web/SliderAmFilterInitializer.java | 1 +
.../apache/slider/server/appmaster/web/SliderAmIpFilter.java | 6 ++
.../slider/server/appmaster/web/TestSliderAmFilter.java | 1 +
5 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
--
diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
b/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
index 38f55c2..1d0a6f5 100644
--- a/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
@@ -172,4 +172,11 @@ public interface SliderKeys extends SliderXmlConfKeys {
* Python specific
*/
String PYTHONPATH = PYTHONPATH;
+
+
+ /**
+ * Name of the AM filter to use: {@value}
+ */
+ String AM_FILTER_NAME =
+ org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 5a84c39..53ce4f8 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -126,8 +126,6 @@ import
org.apache.slider.server.appmaster.state.SimpleReleaseSelector;
import org.apache.slider.server.appmaster.web.AgentService;
import org.apache.slider.server.appmaster.web.rest.agent.AgentWebApp;
import org.apache.slider.server.appmaster.web.SliderAMWebApp;
-import org.apache.slider.server.appmaster.web.SliderAmFilterInitializer;
-import org.apache.slider.server.appmaster.web.SliderAmIpFilter;
import org.apache.slider.server.appmaster.web.WebAppApi;
import org.apache.slider.server.appmaster.web.WebAppApiImpl;
import org.apache.slider.server.appmaster.web.rest.RestPaths;
@@ -536,10 +534,8 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
}
Configuration serviceConf = getConfig();
-// Try to get the proper filtering of static resources through the yarn
proxy working
-serviceConf.set(HADOOP_HTTP_FILTER_INITIALIZERS,
-SliderAmFilterInitializer.NAME);
-serviceConf.set(SliderAmIpFilter.WS_CONTEXT_ROOT, WS_CONTEXT_ROOT + | +
WS_AGENT_CONTEXT_ROOT);
+// IP filtering
+serviceConf.set(HADOOP_HTTP_FILTER_INITIALIZERS, AM_FILTER_NAME);
//get our provider
MapOperations globalInternalOptions = getGlobalInternalOptions();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
index 5fffa4a..df6cea4 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
import java.util.HashMap;
import java.util.Map;
+@Deprecated
public class SliderAmFilterInitializer extends FilterInitializer {
private static final String FILTER_NAME = AM_PROXY_FILTER;
private static final String FILTER_CLASS =
SliderAmIpFilter.class.getCanonicalName();
[01/21] git commit: SLIDER-304 initial token renewal code for review
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry c692461b7 -
c5fb4f040
SLIDER-304 initial token renewal code for review
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0bd6c6cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0bd6c6cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0bd6c6cf
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 0bd6c6cf93b098358c252355e2fbde7e87bd2fe7
Parents: d3e4bf2
Author: Jon Maron jma...@hortonworks.com
Authored: Mon Aug 25 18:30:20 2014 -0400
Committer: Jon Maron jma...@hortonworks.com
Committed: Mon Aug 25 18:30:20 2014 -0400
--
.../server/appmaster/SliderAppMaster.java | 88 ---
.../appmaster/actions/RenewingAction.java | 35 ++-
.../security/FsDelegationTokenManager.java | 257 +++
.../TestFsDelegationTokenManager.groovy | 244 ++
4 files changed, 584 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0bd6c6cf/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index b4515f1..33ad1df 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -133,6 +133,7 @@ import org.apache.slider.server.appmaster.web.WebAppApiImpl;
import org.apache.slider.server.appmaster.web.rest.RestPaths;
import org.apache.slider.server.services.registry.SliderRegistryService;
import org.apache.slider.server.services.security.CertificateManager;
+import org.apache.slider.server.services.security.FsDelegationTokenManager;
import org.apache.slider.server.services.utility.AbstractSliderLaunchedService;
import org.apache.slider.server.services.utility.WebAppService;
import org.apache.slider.server.services.workflow.ServiceThreadFactory;
@@ -351,6 +352,7 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
private final QueueService actionQueues = new QueueService();
private String agentOpsUrl;
private String agentStatusUrl;
+ private FsDelegationTokenManager fsDelegationTokenManager;
/**
* Service Constructor
@@ -417,8 +419,8 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
@Override
protected void serviceStart() throws Exception {
super.serviceStart();
-executorService.execute(new QueueExecutor(this, actionQueues));
executorService.execute(actionQueues);
+executorService.execute(new QueueExecutor(this, actionQueues));
}
/* === */
@@ -583,36 +585,6 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
appInformation.put(StatusKeys.INFO_AM_ATTEMPT_ID,
appAttemptID.toString());
-UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
-Credentials credentials =
- currentUser.getCredentials();
-DataOutputBuffer dob = new DataOutputBuffer();
-credentials.writeTokenStorageToStream(dob);
-dob.close();
-// Now remove the AM-RM token so that containers cannot access it.
-IteratorToken? iter = credentials.getAllTokens().iterator();
-while (iter.hasNext()) {
- Token? token = iter.next();
- log.info(Token {}, token.getKind());
- if (token.getKind().equals(AMRMTokenIdentifier.KIND_NAME)) {
-iter.remove();
- }
-}
-allTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
-
-// set up secret manager
-secretManager = new ClientToAMTokenSecretManager(appAttemptID, null);
-
-// if not a secure cluster, extract the username -it will be
-// propagated to workers
-if (!UserGroupInformation.isSecurityEnabled()) {
- hadoop_user_name = System.getenv(HADOOP_USER_NAME);
- service_user_name = hadoop_user_name;
- log.info(HADOOP_USER_NAME + ='{}', hadoop_user_name);
-} else {
- service_user_name = UserGroupInformation.getCurrentUser().getUserName();
-}
-
MapString, String envVars;
ListContainer liveContainers;
/**
@@ -636,6 +608,9 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
nmClientAsync = new NMClientAsyncImpl(nmclient, this);
deployChildService(nmClientAsync);
+ // set up secret manager
+ secretManager = new
[14/21] git commit: SLIDER-258. Jenkins build continue to hang on python unit tests
SLIDER-258. Jenkins build continue to hang on python unit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8bfd66e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8bfd66e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8bfd66e8
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 8bfd66e813635aa93a9551c121622b408d41b518
Parents: f292a16
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Thu Aug 28 15:37:31 2014 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Thu Aug 28 15:37:31 2014 -0700
--
.../src/test/python/agent/TestRegistration.py | 14 +-
slider-agent/src/test/python/unitTests.py | 1 +
2 files changed, 2 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8bfd66e8/slider-agent/src/test/python/agent/TestRegistration.py
--
diff --git a/slider-agent/src/test/python/agent/TestRegistration.py
b/slider-agent/src/test/python/agent/TestRegistration.py
index f91fe29..7b3c875 100644
--- a/slider-agent/src/test/python/agent/TestRegistration.py
+++ b/slider-agent/src/test/python/agent/TestRegistration.py
@@ -37,15 +37,6 @@ class TestRegistration(TestCase):
config = AgentConfig(tmpdir, ver_dir)
config.set('agent', 'prefix', tmpdir)
config.set('agent', 'current_ping_port', '33777')
-try:
- os.mkdir(ver_dir)
-except OSError as exception:
- if exception.errno != errno.EEXIST:
-raise
-pass
-ver_file = os.path.join(ver_dir, version)
-with open(ver_file, w) as text_file:
- text_file.write(1.3.0)
register = Register(config)
data = register.build(State.INIT, State.INIT, {}, 1)
@@ -54,7 +45,7 @@ class TestRegistration(TestCase):
self.assertEquals(data['publicHostname'] != , True, publicHostname
should not be empty)
self.assertEquals(data['responseId'], 1)
self.assertEquals(data['timestamp'] 1353678475465L, True, timestamp
should not be empty)
-self.assertEquals(data['agentVersion'], '1.3.0', agentVersion should not
be empty)
+self.assertEquals(data['agentVersion'], '1', agentVersion should not be
empty)
self.assertEquals(data['actualState'], State.INIT, actualState should not
be empty)
self.assertEquals(data['expectedState'], State.INIT, expectedState should
not be empty)
self.assertEquals(data['allocatedPorts'], {}, allocatedPorts should be
empty)
@@ -66,8 +57,5 @@ class TestRegistration(TestCase):
self.assertEquals(os.path.join(ver_dir, .),
config.getResolvedPath(log_dir))
self.assertEquals(os.path.join(ver_dir, .),
config.getResolvedPath(app_task_dir))
-os.remove(ver_file)
-os.removedirs(ver_dir)
-
if __name__ == __main__:
unittest.main()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8bfd66e8/slider-agent/src/test/python/unitTests.py
--
diff --git a/slider-agent/src/test/python/unitTests.py
b/slider-agent/src/test/python/unitTests.py
index e3f2d7c..b01438e 100644
--- a/slider-agent/src/test/python/unitTests.py
+++ b/slider-agent/src/test/python/unitTests.py
@@ -56,6 +56,7 @@ def all_tests_suite():
files_list += os.listdir(src_dir + os.sep + directory)
## temporarily deleting to add more predictability
## shuffle(files_list)
+ files_list.sort()
tests_list = []
logger.info('TESTS
LIST:-')
[11/21] git commit: SLIDER-368 change app package names to standard maven artifact names
SLIDER-368 change app package names to standard maven artifact 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/e4d136e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e4d136e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e4d136e1
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: e4d136e152161fa4c7a8f648773797d8b2541867
Parents: b336c57
Author: Billie Rinaldi billie.rina...@gmail.com
Authored: Thu Aug 28 08:36:17 2014 -0700
Committer: Billie Rinaldi billie.rina...@gmail.com
Committed: Thu Aug 28 08:36:17 2014 -0700
--
app-packages/accumulo/pom.xml | 2 +-
app-packages/hbase/pom.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e4d136e1/app-packages/accumulo/pom.xml
--
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 40d6ba7..548ced8 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -30,7 +30,7 @@
properties
work.dirpackage-tmp/work.dir
-
app.package.nameapache-slider-accumulo-${accumulo.version}-app-package-${project.version}/app.package.name
+
app.package.name${project.artifactId}-${project.version}/app.package.name
/properties
profiles
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e4d136e1/app-packages/hbase/pom.xml
--
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 7dede6c..442b0f2 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -29,7 +29,7 @@
descriptionSlider HBase App Package/description
properties
work.dirpackage-tmp/work.dir
-
app.package.nameapache-slider-hbase-${hbase.version}-app-package-${project.version}/app.package.name
+
app.package.name${project.artifactId}-${project.version}/app.package.name
/properties
profiles
[09/21] git commit: SLIDER-372 Chaos monkey service to not be created if interval ==0; RenewingAction also rejects 0 intervals
SLIDER-372 Chaos monkey service to not be created if interval ==0;
RenewingAction also rejects 0 intervals
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0c4fb57f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0c4fb57f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0c4fb57f
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 0c4fb57fefb97cfc1ef99165758f25b931ad617b
Parents: 671830d
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 16:30:45 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Thu Aug 28 16:31:23 2014 +0100
--
.../apache/slider/server/appmaster/SliderAppMaster.java | 10 +-
.../slider/server/appmaster/actions/RenewingAction.java | 1 +
.../server/appmaster/monkey/ChaosMonkeyService.java | 4 ++--
.../agent/standalone/TestStandaloneAMMonkeyRestart.groovy | 4
4 files changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0c4fb57f/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 8e781f0..51c3b93 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -1817,6 +1817,11 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
InternalKeys.DEFAULT_CHAOS_MONKEY_INTERVAL_HOURS,
InternalKeys.DEFAULT_CHAOS_MONKEY_INTERVAL_MINUTES,
0);
+if (monkeyInterval == 0) {
+ log.debug(
+ Chaos monkey not configured with a time interval...not enabling);
+ return false;
+}
log.info(Adding Chaos Monkey scheduled every {} seconds ({} hours),
monkeyInterval, monkeyInterval/(60*60));
monkey = new ChaosMonkeyService(metrics, actionQueues);
@@ -1838,8 +1843,11 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
// and schedule it
if (monkey.schedule(monkeyInterval, TimeUnit.SECONDS)) {
log.info(Chaos Monkey is running);
+ return true;
+} else {
+ log.info(Chaos monkey not started);
+ return false;
}
-return true;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0c4fb57f/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RenewingAction.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RenewingAction.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RenewingAction.java
index 40c1021..1164df9 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RenewingAction.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RenewingAction.java
@@ -64,6 +64,7 @@ public class RenewingActionA extends AsyncAction extends
AsyncAction {
// slightly superfluous as the super init above checks these
values...retained
// in case that code is ever changed
Preconditions.checkArgument(action != null, null actions);
+Preconditions.checkArgument(interval 0, invalid interval: + interval);
this.action = action;
this.interval = interval;
this.timeUnit = timeUnit;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0c4fb57f/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
index fa288af..f7b1eb7 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
@@ -94,10 +94,10 @@ public class ChaosMonkeyService extends AbstractService {
* Schedule the monkey
* @param time interval
* @param timeUnit time unit
- * @return true if it was scheduled (i.e. 1+ action)
+ * @return true if it was scheduled (i.e. 1+ action) and interval 0
*/
public boolean schedule(long time, TimeUnit timeUnit) {
-if (!chaosEntries.isEmpty()) {
+if (time 0 !chaosEntries.isEmpty()) {
queues.schedule(getChaosAction(time, timeUnit));
return
[07/21] git commit: Merge branch 'feature/SLIDER-304_hdfs_token_renewal' into develop
Merge branch 'feature/SLIDER-304_hdfs_token_renewal' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/671830d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/671830d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/671830d7 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 671830d70bc0efa19e7d50b2b8228db4f42388aa Parents: 93e2b52 c939ac6 Author: Jon Maron jma...@hortonworks.com Authored: Thu Aug 28 11:16:07 2014 -0400 Committer: Jon Maron jma...@hortonworks.com Committed: Thu Aug 28 11:16:07 2014 -0400 -- .../server/appmaster/SliderAppMaster.java | 84 +++--- .../appmaster/actions/RenewingAction.java | 35 ++- .../security/FsDelegationTokenManager.java | 257 +++ .../TestFsDelegationTokenManager.groovy | 244 ++ 4 files changed, 581 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/671830d7/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java --
[06/21] git commit: Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5fad4934 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5fad4934 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5fad4934 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 5fad4934a9bcf1412e5714b5d519f747254b3cf9 Parents: c692461 93e2b52 Author: Steve Loughran ste...@apache.org Authored: Thu Aug 28 15:50:44 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Thu Aug 28 15:50:44 2014 +0100 -- .../org/apache/slider/common/SliderKeys.java| 7 + .../server/appmaster/SliderAppMaster.java | 8 +- .../web/SliderAmFilterInitializer.java | 71 --- .../server/appmaster/web/SliderAmIpFilter.java | 155 -- .../appmaster/web/TestSliderAmFilter.java | 200 --- 5 files changed, 9 insertions(+), 432 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5fad4934/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java --
[21/21] git commit: SLIDER-149 add PersistencePolicy
SLIDER-149 add PersistencePolicy
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c5fb4f04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c5fb4f04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c5fb4f04
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: c5fb4f040bd0727426405815a6aba8542c07aa2d
Parents: 4cbc9fe
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 17:49:03 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 17:49:03 2014 +0100
--
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c5fb4f04/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index a2545ab..e80a362 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.ipc.YarnRPC;
import
org.apache.hadoop.yarn.registry.client.services.RegistryOperationsService;
+import org.apache.hadoop.yarn.registry.client.types.PersistencePolicies;
import org.apache.hadoop.yarn.registry.client.types.ServiceRecord;
import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils;
import
org.apache.hadoop.yarn.registry.server.services.ResourceManagerRegistryService;
@@ -165,9 +166,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import static
org.apache.slider.server.appmaster.web.rest.RestPaths.WS_AGENT_CONTEXT_ROOT;
-import static
org.apache.slider.server.appmaster.web.rest.RestPaths.WS_CONTEXT_ROOT;
-
/**
* This is the AM, which directly implements the callbacks from the AM and NM
*/
@@ -989,7 +987,7 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
/**
* Handler for {@link RegisterComponentInstance action}
- * Register/re-register a component (that is already in the app state
+ * Register/re-register an ephemeral container that is already in the app
state
* @param id the component
* @param description
*/
@@ -1004,7 +1002,8 @@ public class SliderAppMaster extends
AbstractSliderLaunchedService
String cid = RegistryTypeUtils.yarnIdToDnsId(id.toString());
ServiceRecord container = new ServiceRecord(
cid,
-description);
+description,
+PersistencePolicies.EPHEMERAL);
try {
yarnRegistryOperations.putComponent(cid, container, true);
} catch (IOException e) {
[12/21] git commit: SLIDER-371 test teardown warning of deletion failures ... fix root cause in SliderUtils
SLIDER-371 test teardown warning of deletion failures ... fix root cause in
SliderUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4d5783e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4d5783e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4d5783e1
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 4d5783e12e3f2a43bfe02e15bf789d34341af0f0
Parents: e4d136e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 16:45:28 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Thu Aug 28 18:28:46 2014 +0100
--
.../apache/slider/common/tools/SliderUtils.java | 55 +++-
.../agent/AgentMiniClusterTestBase.groovy | 2 +-
2 files changed, 31 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d5783e1/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 188b7d9..a864878 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
@@ -1460,35 +1460,40 @@ public final class SliderUtils {
String entry)
throws IOException {
InputStream is = null;
-FSDataInputStream appStream = fs.open(appPath);
-ZipArchiveInputStream zis = new ZipArchiveInputStream(appStream);
-ZipArchiveEntry zipEntry;
-boolean done = false;
-while (!done (zipEntry = zis.getNextZipEntry()) != null) {
- if (entry.equals(zipEntry.getName())) {
-int size = (int) zipEntry.getSize();
-if (size != -1) {
- log.info(Reading {} of size {}, zipEntry.getName(),
zipEntry.getSize());
- byte[] content = new byte[size];
- int offset = 0;
- while (offset size) {
-offset += zis.read(content, offset, size - offset);
- }
- is = new ByteArrayInputStream(content);
-} else {
- log.debug(Size unknown. Reading {}, zipEntry.getName());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- while (true) {
-int byteRead = zis.read();
-if (byteRead == -1) {
- break;
+FSDataInputStream appStream = null;
+try {
+ appStream = fs.open(appPath);
+ ZipArchiveInputStream zis = new ZipArchiveInputStream(appStream);
+ ZipArchiveEntry zipEntry;
+ boolean done = false;
+ while (!done (zipEntry = zis.getNextZipEntry()) != null) {
+if (entry.equals(zipEntry.getName())) {
+ int size = (int) zipEntry.getSize();
+ if (size != -1) {
+log.info(Reading {} of size {}, zipEntry.getName(),
zipEntry.getSize());
+byte[] content = new byte[size];
+int offset = 0;
+while (offset size) {
+ offset += zis.read(content, offset, size - offset);
}
-baos.write(byteRead);
+is = new ByteArrayInputStream(content);
+ } else {
+log.debug(Size unknown. Reading {}, zipEntry.getName());
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+while (true) {
+ int byteRead = zis.read();
+ if (byteRead == -1) {
+break;
+ }
+ baos.write(byteRead);
+}
+is = new ByteArrayInputStream(baos.toByteArray());
}
- is = new ByteArrayInputStream(baos.toByteArray());
+ done = true;
}
-done = true;
}
+} finally {
+ IOUtils.closeStream(appStream);
}
return is;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d5783e1/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index a957481..4566d9d 100644
---
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -85,7 +85,7 @@ extends YarnZKMiniClusterTestBase {
try {
FileUtils.deleteDirectory(tempRoot);
} catch (IOException e) {
-log.warn(Failed to delete $tempRoot
[04/21] git commit: SLIDER-36 delete custom IP filter and tests
SLIDER-36 delete custom IP filter and tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/dcae064c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/dcae064c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/dcae064c
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: dcae064caa2dc636560821adcc222f038c17270e
Parents: 265c478
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 15:49:40 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Thu Aug 28 15:49:40 2014 +0100
--
.../web/SliderAmFilterInitializer.java | 72 ---
.../server/appmaster/web/SliderAmIpFilter.java | 161 ---
.../appmaster/web/TestSliderAmFilter.java | 201 ---
3 files changed, 434 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dcae064c/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
deleted file mode 100644
index df6cea4..000
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* 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.server.appmaster.web;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.http.FilterContainer;
-import org.apache.hadoop.http.FilterInitializer;
-import org.apache.hadoop.http.HttpConfig;
-import org.apache.hadoop.yarn.api.ApplicationConstants;
-import org.apache.hadoop.yarn.conf.YarnConfiguration;
-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Deprecated
-public class SliderAmFilterInitializer extends FilterInitializer {
- private static final String FILTER_NAME = AM_PROXY_FILTER;
- private static final String FILTER_CLASS =
SliderAmIpFilter.class.getCanonicalName();
- private static final String HTTPS_PREFIX = https://;;
- private static final String HTTP_PREFIX = http://;;
- private Configuration configuration;
-
- public static final String NAME =
-org.apache.slider.server.appmaster.web.SliderAmFilterInitializer;
-
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
-configuration = conf;
-MapString, String params = new HashMapString, String();
-String proxy = WebAppUtils.getProxyHostAndPort(conf);
-String[] parts = proxy.split(:);
-params.put(SliderAmIpFilter.PROXY_HOST, parts[0]);
-// todo: eventually call WebAppUtils.getHttpSchemePrefix
-params.put(SliderAmIpFilter.PROXY_URI_BASE, getHttpSchemePrefix()
-+ proxy + getApplicationWebProxyBase());
-params.put(SliderAmIpFilter.WS_CONTEXT_ROOT,
- conf.get(SliderAmIpFilter.WS_CONTEXT_ROOT));
-container.addFilter(FILTER_NAME, FILTER_CLASS, params);
- }
-
- @VisibleForTesting
- protected String getApplicationWebProxyBase() {
-return System.getenv(ApplicationConstants.APPLICATION_WEB_PROXY_BASE_ENV);
- }
-
- private String getHttpSchemePrefix() {
-return HttpConfig.Policy.HTTPS_ONLY ==
- HttpConfig.Policy.fromString(configuration
- .get(
-
YarnConfiguration.YARN_HTTP_POLICY_KEY,
-
YarnConfiguration.YARN_HTTP_POLICY_DEFAULT))
- ? HTTPS_PREFIX : HTTP_PREFIX;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dcae064c/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java
--
diff
[15/21] git commit: SLIDER-375 TestLongLivedProcess needed windows command translation
SLIDER-375 TestLongLivedProcess needed windows command translation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6797222c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6797222c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6797222c
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 6797222c92b887ffadb066251b5886787bb4cf44
Parents: 8bfd66e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 19:15:14 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../workflow/ProcessCommandFactory.java | 21 ++--
.../services/workflow/TestLongLivedProcess.java | 6 ++
.../workflow/WorkflowServiceTestBase.java | 3 ++-
3 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..4a19417 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -18,8 +18,11 @@
package org.apache.slider.server.services.workflow;
+import org.apache.hadoop.util.Shell;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,10 +40,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
-commands.add(ls);
-commands.add(-1);
-commands.add(dir.getAbsolutePath());
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(ls,-1, dir.getAbsolutePath());
+} else {
+ commands = Arrays.asList(cmd, /c, dir, dir.getAbsolutePath());
+}
return commands;
}
@@ -61,8 +66,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString env() {
-ListString commands = new ArrayListString(1);
-commands.add(env);
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(env);
+} else {
+ commands = Arrays.asList(cmd, /c, set);
+}
return commands;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/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 668bcca..9019124 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
@@ -33,11 +33,9 @@ import java.util.List;
*/
public class TestLongLivedProcess extends WorkflowServiceTestBase implements
LongLivedProcessLifecycleEvent {
- private static final Logger
- log = LoggerFactory.getLogger(TestLongLivedProcess.class);
+ private static final Logger log =
LoggerFactory.getLogger(TestLongLivedProcess.class);
- private static final Logger
- processLog =
+ private static final Logger processLog =
LoggerFactory.getLogger(org.apache.hadoop.services.workflow.Process);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
index 3049d8f..f38bd9d 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.Callable;
/**
@@ -122,7 +123,7 @@ public abstract class WorkflowServiceTestBase
[13/21] git commit: SLIDER-366. App package clean up - remove extra information from appConfig.json for memcached.
SLIDER-366. App package clean up - remove extra information from appConfig.json
for memcached.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f292a16e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f292a16e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f292a16e
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: f292a16ebfed4d75711f87577f4cde63698e3704
Parents: 4d5783e
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Thu Aug 28 12:51:49 2014 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Thu Aug 28 12:51:49 2014 -0700
--
app-packages/memcached/appConfig.json | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f292a16e/app-packages/memcached/appConfig.json
--
diff --git a/app-packages/memcached/appConfig.json
b/app-packages/memcached/appConfig.json
index 7a97f98..c335959 100644
--- a/app-packages/memcached/appConfig.json
+++ b/app-packages/memcached/appConfig.json
@@ -19,8 +19,6 @@
components: {
slider-appmaster: {
jvm.heapsize: 256M
-},
-MEMCACHED: {
}
}
}
[20/21] git commit: Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Conflicts: slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4cbc9fe7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4cbc9fe7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4cbc9fe7 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 4cbc9fe7fe8f047c92a5a40062ef1f5ebe36 Parents: 9708292 c91d5ec Author: Steve Loughran ste...@apache.org Authored: Fri Aug 29 15:54:56 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Fri Aug 29 15:54:56 2014 +0100 -- app-packages/accumulo/pom.xml | 2 +- .../funtest/accumulo/AccumuloSSLTestBase.groovy | 28 +- app-packages/hbase/pom.xml | 2 +- app-packages/memcached/appConfig.json | 2 - .../src/test/python/agent/TestRegistration.py | 14 +- slider-agent/src/test/python/unitTests.py | 1 + .../apache/slider/common/tools/SliderUtils.java | 55 ++-- .../server/appmaster/SliderAppMaster.java | 94 --- .../appmaster/actions/RenewingAction.java | 36 ++- .../appmaster/monkey/ChaosMonkeyService.java| 4 +- .../security/FsDelegationTokenManager.java | 257 +++ .../agent/AgentMiniClusterTestBase.groovy | 2 +- .../TestStandaloneAMMonkeyRestart.groovy| 4 - .../agent/TestAgentAMManagementWS.groovy| 8 +- .../slider/providers/agent/TestAgentEcho.groovy | 6 +- .../curator/TestRegistryRestResources.groovy| 6 +- .../publisher/TestPublisherRestResources.groovy | 26 +- .../TestFsDelegationTokenManager.groovy | 244 ++ .../apache/slider/test/SliderTestUtils.groovy | 9 + .../workflow/ProcessCommandFactory.java | 21 +- .../services/workflow/TestLongLivedProcess.java | 6 +- .../workflow/WorkflowServiceTestBase.java | 3 +- 22 files changed, 696 insertions(+), 134 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4cbc9fe7/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java -- diff --cc slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 6bd67d2,51c3b93..a2545ab --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@@ -363,7 -350,7 +364,8 @@@ public class SliderAppMaster extends Ab private final QueueService actionQueues = new QueueService(); private String agentOpsUrl; private String agentStatusUrl; + private YarnRegistryViewForProviders yarnRegistryOperations; + private FsDelegationTokenManager fsDelegationTokenManager; /** * Service Constructor http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4cbc9fe7/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy --
git commit: SLIDER-377: changing outcome if winutils.exe is not on the path
Repository: incubator-slider
Updated Branches:
refs/heads/develop c91d5ecd3 - 686fdff35
SLIDER-377: changing outcome if winutils.exe is not 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/686fdff3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/686fdff3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/686fdff3
Branch: refs/heads/develop
Commit: 686fdff358a978fdc56240e82c045dfc5ae0a591
Parents: c91d5ec
Author: Steve Loughran ste...@apache.org
Authored: Fri Aug 29 17:54:21 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 17:54:21 2014 +0100
--
.../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/686fdff3/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 5a091bf..5aef585 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
@@ -132,7 +132,12 @@ public abstract class YarnMiniClusterTestBase extends
ServiceLauncherBaseTest {
@BeforeClass
public static void checkWindowsSupport() {
if (Shell.WINDOWS) {
- assertNotNull(winutils.exe not found, Shell.WINUTILS)
+// assertNotNull(winutils.exe not found, Shell.WINUTILS)
+ if (!Shell.WINUTILS) {
+log.error(winutils.exe not found)
+ }
+ def lib = System.getProperty(java.library.path)
+ log.debug(java.library.path = ${lib})
}
}
[8/9] git commit: using is None over == None in .py
using is None over == None in .py Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/329cab03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/329cab03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/329cab03 Branch: refs/heads/feature/SLIDER_187_start_stop Commit: 329cab03e07759fdaea4d77737abe0a42d4f9947 Parents: 686fdff Author: Steve Loughran ste...@apache.org Authored: Fri Aug 29 19:09:07 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Fri Aug 29 19:09:07 2014 +0100 -- slider-assembly/src/main/scripts/slider.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/329cab03/slider-assembly/src/main/scripts/slider.py -- diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py index db4b881..be79973 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -147,9 +147,9 @@ def java(classname, args, classpath, jvm_opts_list): # split the JVM opts by space # java = /usr/bin/java - prg=java - if which(java)==None: -prg=os.environ[JAVA_HOME]+/bin/java + prg = java + if which(java) is None: +prg = os.environ[JAVA_HOME] + /bin/java commandline = [prg] commandline.extend(jvm_opts_list) commandline.append(-classpath)
[6/9] git commit: Merge branch 'feature/SLIDER-375_slider-core_tests_failing_on_windows' into develop
Merge branch 'feature/SLIDER-375_slider-core_tests_failing_on_windows' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c91d5ecd Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c91d5ecd Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c91d5ecd Branch: refs/heads/feature/SLIDER_187_start_stop Commit: c91d5ecd3a8b78d218bd02a5e2e7c9e7fefbc8cf Parents: 8bfd66e aceab6b Author: Steve Loughran ste...@apache.org Authored: Fri Aug 29 13:19:52 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Fri Aug 29 13:19:52 2014 +0100 -- .../agent/TestAgentAMManagementWS.groovy| 8 +++--- .../slider/providers/agent/TestAgentEcho.groovy | 6 ++--- .../curator/TestRegistryRestResources.groovy| 6 ++--- .../publisher/TestPublisherRestResources.groovy | 26 +--- .../apache/slider/test/SliderTestUtils.groovy | 9 +++ .../workflow/ProcessCommandFactory.java | 21 +++- .../services/workflow/TestLongLivedProcess.java | 6 ++--- .../workflow/WorkflowServiceTestBase.java | 3 ++- 8 files changed, 51 insertions(+), 34 deletions(-) --
[3/9] git commit: SLIDER-375 TestLongLivedProcess needed windows command translation
SLIDER-375 TestLongLivedProcess needed windows command translation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6797222c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6797222c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6797222c
Branch: refs/heads/feature/SLIDER_187_start_stop
Commit: 6797222c92b887ffadb066251b5886787bb4cf44
Parents: 8bfd66e
Author: Steve Loughran ste...@apache.org
Authored: Thu Aug 28 19:15:14 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Fri Aug 29 13:18:59 2014 +0100
--
.../workflow/ProcessCommandFactory.java | 21 ++--
.../services/workflow/TestLongLivedProcess.java | 6 ++
.../workflow/WorkflowServiceTestBase.java | 3 ++-
3 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..4a19417 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -18,8 +18,11 @@
package org.apache.slider.server.services.workflow;
+import org.apache.hadoop.util.Shell;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,10 +40,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
-commands.add(ls);
-commands.add(-1);
-commands.add(dir.getAbsolutePath());
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(ls,-1, dir.getAbsolutePath());
+} else {
+ commands = Arrays.asList(cmd, /c, dir, dir.getAbsolutePath());
+}
return commands;
}
@@ -61,8 +66,12 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString env() {
-ListString commands = new ArrayListString(1);
-commands.add(env);
+ListString commands;
+if (!Shell.WINDOWS) {
+ commands = Arrays.asList(env);
+} else {
+ commands = Arrays.asList(cmd, /c, set);
+}
return commands;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/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 668bcca..9019124 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
@@ -33,11 +33,9 @@ import java.util.List;
*/
public class TestLongLivedProcess extends WorkflowServiceTestBase implements
LongLivedProcessLifecycleEvent {
- private static final Logger
- log = LoggerFactory.getLogger(TestLongLivedProcess.class);
+ private static final Logger log =
LoggerFactory.getLogger(TestLongLivedProcess.class);
- private static final Logger
- processLog =
+ private static final Logger processLog =
LoggerFactory.getLogger(org.apache.hadoop.services.workflow.Process);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6797222c/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
index 3049d8f..f38bd9d 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.Callable;
/**
@@ -122,7 +123,7 @@ public abstract class WorkflowServiceTestBase extends
Assert {
