You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/10/09 00:52:58 UTC
[09/50] [abbrv] 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/f67b5507
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f67b5507
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f67b5507
Branch: refs/heads/develop
Commit: f67b5507b7230a025e7c54064e2614258f009116
Parents: 6e9380c a8dfc67
Author: Steve Loughran <st...@apache.org>
Authored: Fri Sep 12 09:59:58 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Sep 12 09:59:58 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 52 +++--
.../command-logger/slider-pkg/appConfig.json | 2 +-
.../command-logger/slider-pkg/metainfo.xml | 2 +-
app-packages/hbase/metainfo.xml | 2 +-
slider-assembly/pom.xml | 20 ++
slider-assembly/src/assembly/slider-bin.xml | 8 +
slider-core/pom.xml | 28 +++
.../org/apache/slider/api/InternalKeys.java | 6 +-
.../org/apache/slider/client/SliderClient.java | 12 +-
.../org/apache/slider/common/SliderKeys.java | 1 +
.../apache/slider/common/tools/SliderUtils.java | 4 +
.../slider/core/build/InstanceBuilder.java | 28 +--
.../apache/slider/providers/ProviderUtils.java | 33 ++-
.../providers/agent/AgentClientProvider.java | 41 ++--
.../providers/agent/AgentProviderService.java | 19 +-
.../web/rest/agent/ExecutionCommand.java | 16 ++
.../appmaster/web/rest/agent/StatusCommand.java | 13 ++
.../test_command_log/appConfig.json | 2 +-
.../providers/agent/TestBuildBasicAgent.groovy | 19 --
.../agent/TestAgentClientProvider2.java | 88 +++++++
.../agent/TestAgentProviderService.java | 230 ++++++++++++++++++-
slider-funtest/pom.xml | 7 +-
.../org/apache/chaos/remote/BuildPidPath.groovy | 54 +++++
.../org/apache/chaos/remote/Clustat.groovy | 64 ++++++
.../apache/chaos/remote/JschToCommonsLog.groovy | 78 +++++++
.../chaos/remote/RemoteDaemonOperations.groovy | 60 +++++
.../org/apache/chaos/remote/RemoteServer.groovy | 188 +++++++++++++++
.../org/apache/chaos/remote/SshCommands.groovy | 190 +++++++++++++++
.../funtest/lifecycle/AMFailuresIT.groovy | 191 +++++++++++++++
29 files changed, 1353 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f67b5507/slider-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f67b5507/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --cc slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index e10eb50,b2d10f6..baa413e
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@@ -1186,10 -1157,12 +1181,12 @@@ public class SliderClient extends Abstr
clusterDirectory,
generatedConfDirPath,
clusterSecure
- );
+ );
- // now add the image if it was set
+ // TODO: consider supporting apps that don't have an image path
+ Path imagePath =
+ SliderUtils.extractImagePath(sliderFileSystem, internalOptions);
if (sliderFileSystem.maybeAddImagePath(localResources, imagePath)) {
log.debug("Registered image path {}", imagePath);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f67b5507/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------