Merge branch 'develop' into feature/SLIDER-1107_AM_config_generation
Conflicts:
slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.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/41de54d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/41de54d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/41de54d7
Branch: refs/heads/feature/SLIDER-1107_AM_config_generation
Commit: 41de54d76aa899387927feb835082012c23149bf
Parents: 40c451e 6de357c
Author: Billie Rinaldi <billie.rina...@gmail.com>
Authored: Tue Jul 12 12:39:15 2016 -0700
Committer: Billie Rinaldi <billie.rina...@gmail.com>
Committed: Tue Jul 12 12:39:15 2016 -0700
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 22 +++-
.../accumulo/src/test/resources/resources.json | 4 +-
.../test/resources/resources_with_proxy.json | 4 +-
.../command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/kafka/pom.xml | 2 +-
app-packages/pom.xml | 50 ++++----
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/package/files/storm-slider | 2 -
app-packages/storm/pom.xml | 2 +-
app-packages/tomcat-test-war/pom.xml | 68 ++++++++++
.../org/apache/slider/war/RootResource.java | 41 ++++++
.../src/main/webapp/WEB-INF/web.xml | 35 +++++
app-packages/tomcat/README.md | 5 -
app-packages/tomcat/appConfig-default.json | 3 +-
app-packages/tomcat/pom.xml | 36 +++++-
.../slider/funtest/tomcat/TomcatBasicIT.groovy | 4 +-
.../src/test/resources/appConfig-default.json | 23 ----
.../tomcat/src/test/resources/slider-test.war | Bin 3694967 -> 0 bytes
bin/release.xml | 2 +-
pom.xml | 127 +++++++------------
slider-agent/pom.xml | 2 +-
.../src/main/python/agent/ActionQueue.py | 6 +-
slider-agent/src/main/python/agent/Constants.py | 4 +-
.../python/agent/CustomServiceOrchestrator.py | 13 +-
.../src/main/python/agent/DockerManager.py | 16 +--
slider-agent/src/main/python/agent/NetUtil.py | 10 +-
.../src/main/python/agent/YarnDockerManager.py | 17 ++-
slider-agent/src/main/python/agent/main.py | 2 +-
.../core/providers/windows/system.py | 14 +-
.../python/resource_management/core/shell.py | 17 +--
.../libraries/functions/os_check.py | 30 ++++-
.../agent/TestCustomServiceOrchestrator.py | 32 +++++
slider-agent/src/test/python/python-wrap | 1 -
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 19 +--
.../apache/hadoop/security/KerberosDiags.java | 47 +++++--
.../java/org/apache/slider/api/RoleKeys.java | 5 +
.../org/apache/slider/common/SliderKeys.java | 5 -
.../AbstractClusterBuildingActionArgs.java | 12 +-
.../params/AppAndResouceOptionArgsDelegate.java | 2 +-
.../apache/slider/common/params/Arguments.java | 1 +
.../apache/slider/common/tools/PortScanner.java | 50 ++++----
.../apache/slider/common/tools/SliderUtils.java | 16 +++
.../core/persist/AppDefinitionPersister.java | 51 ++++++--
.../providers/agent/AgentClientProvider.java | 2 +-
.../server/appmaster/SliderAppMaster.java | 66 ++++------
.../slider/server/appmaster/state/AppState.java | 40 +++---
.../appmaster/state/OutstandingRequest.java | 2 +
.../appmaster/web/rest/agent/AgentWebApp.java | 35 ++++-
.../services/workflow/LongLivedProcess.java | 8 +-
.../workflow/ServiceTerminatingRunnable.java | 4 +-
.../services/workflow/ServiceThreadFactory.java | 10 +-
.../workflow/WorkflowCallbackService.java | 9 +-
.../src/main/resources/webapps/static/busy.gif | Bin 3494 -> 0 bytes
.../main/resources/webapps/static/hadoop-st.png | Bin 23946 -> 0 bytes
.../test_command_log/resources.json | 2 +-
.../test_command_log/resources_add_on_pkg.json | 4 +-
.../standalone/TestBuildStandaloneAM.groovy | 50 ++++++++
.../apache/slider/client/TestDiagnostics.groovy | 52 +++++++-
.../slider/common/tools/TestPortScan.groovy | 44 +++++++
.../appstate/TestMockAppStateAAPlacement.groovy | 8 +-
.../appstate/TestMockAppStateUniqueNames.groovy | 51 ++++++++
.../appstate/TestMockLabelledAAPlacement.groovy | 11 +-
.../TestOutstandingRequestValidation.groovy | 26 ----
.../model/history/TestRoleHistoryAA.groovy | 12 +-
...tRoleHistoryOutstandingRequestTracker.groovy | 5 +-
.../model/mock/MockContainerStatus.groovy | 34 -----
.../appmaster/model/mock/MockFactory.groovy | 60 ++++++++-
.../appmaster/model/mock/MockNodeReport.groovy | 75 -----------
.../model/mock/MockRecordFactory.groovy | 37 ++++++
.../appmaster/model/mock/MockYarnCluster.groovy | 9 +-
.../appmaster/model/mock/MockYarnEngine.groovy | 5 +-
.../agent/TestAppDefinitionPersister.java | 43 ++++++-
slider-funtest/pom.xml | 2 +-
77 files changed, 1002 insertions(+), 518 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-agent/src/main/python/agent/ActionQueue.py
----------------------------------------------------------------------
diff --cc slider-agent/src/main/python/agent/ActionQueue.py
index 6b16767,7514337..e973337
--- a/slider-agent/src/main/python/agent/ActionQueue.py
+++ b/slider-agent/src/main/python/agent/ActionQueue.py
@@@ -161,10 -161,10 +161,10 @@@ class ActionQueue(threading.Thread)
self.commandStatuses.put_command_status(command, in_progress_status,
reportResult)
store_config = False
- if ActionQueue.STORE_APPLIED_CONFIG in command['commandParams']:
+ if 'commandParams' in command and ActionQueue.STORE_APPLIED_CONFIG in
command['commandParams']:
store_config = 'true' ==
command['commandParams'][ActionQueue.STORE_APPLIED_CONFIG]
store_command = False
- if 'roleParams' in command and ActionQueue.AUTO_RESTART in
command['roleParams']:
+ if 'roleParams' in command and command['roleParams'] is not None and
ActionQueue.AUTO_RESTART in command['roleParams']:
store_command = 'true' ==
command['roleParams'][ActionQueue.AUTO_RESTART]
if store_command:
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java
index e96baef,8efaa5b..7fb3158
---
a/slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java
+++
b/slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java
@@@ -125,10 -148,13 +148,17 @@@ public class AppDefinitionPersister
File tempDir = Files.createTempDir();
File pkgSrcDir = new File(tempDir, "default");
pkgSrcDir.mkdirs();
- if (buildInfo.appMetaInfo.getName().endsWith(".xml")) {
- Files.copy(buildInfo.appMetaInfo, new File(pkgSrcDir,
"metainfo.xml"));
+ File destMetaInfo = new File(pkgSrcDir, "metainfo.json");
+ if (isFileUsed) {
- Files.copy(buildInfo.appMetaInfo, destMetaInfo);
++ if (buildInfo.appMetaInfo.getName().endsWith(".xml")) {
++ Files.copy(buildInfo.appMetaInfo, new File(pkgSrcDir,
"metainfo.xml"));
++ } else {
++ Files.copy(buildInfo.appMetaInfo, destMetaInfo);
++ }
} else {
- Files.copy(buildInfo.appMetaInfo, new File(pkgSrcDir,
"metainfo.json"));
+ Files.write(
+ buildInfo.appMetaInfoJson.getBytes(Charset.forName("UTF-8")),
+ destMetaInfo);
}
Path appDirPath = sliderFileSystem.buildAppDefDirPath(clustername);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41de54d7/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
----------------------------------------------------------------------
