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/23 12:36:35 UTC
[05/13] git commit: Resolve merge conflict
Resolve merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ec07bdc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ec07bdc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ec07bdc1
Branch: refs/heads/feature/SLIDER-460-stderr
Commit: ec07bdc12c29613f165dcece5a50d45a93ef1c21
Parents: 34b909a 714a335
Author: Gour Saha <gs...@hortonworks.com>
Authored: Wed Oct 22 21:22:41 2014 -0700
Committer: Gour Saha <gs...@hortonworks.com>
Committed: Wed Oct 22 21:22:41 2014 -0700
----------------------------------------------------------------------
.../command-logger/slider-pkg/appConfig.json | 3 +-
.../command-logger/slider-pkg/metainfo.xml | 2 +
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 5 +-
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 6 +-
app-packages/storm/pom.xml | 1 +
pom.xml | 29 ++-
.../python/agent/CustomServiceOrchestrator.py | 2 +-
.../agent/TestCustomServiceOrchestrator.py | 2 +-
slider-assembly/src/main/scripts/slider | 5 +-
slider-assembly/src/main/scripts/slider.py | 22 +-
.../org/apache/slider/api/proto/Messages.java | 17 ++
.../slider/api/proto/SliderClusterAPI.java | 18 +-
.../org/apache/slider/client/SliderClient.java | 193 ++++++++++++------
.../org/apache/slider/common/SliderKeys.java | 2 +
.../common/params/ActionDiagnosticArgs.java | 10 +-
.../slider/common/params/ActionExistsArgs.java | 7 +-
.../apache/slider/common/params/Arguments.java | 1 +
.../slider/common/params/SliderActions.java | 1 +
.../slider/common/tools/ConfigHelper.java | 51 ++++-
.../apache/slider/common/tools/PortScanner.java | 90 ++++++++
.../apache/slider/common/tools/SliderUtils.java | 14 +-
.../exceptions/BadClusterStateException.java | 2 +-
.../core/exceptions/MissingArgException.java | 26 ---
.../core/exceptions/NotFoundException.java | 35 ++++
.../core/launch/ClasspathConstructor.java | 2 +-
.../providers/AbstractProviderService.java | 10 +-
.../slider/providers/agent/AgentKeys.java | 2 +
.../providers/agent/AgentProviderService.java | 166 ++++++++++++---
.../server/appmaster/SliderAppMaster.java | 142 ++++++++++---
.../operations/AsyncRMOperationHandler.java | 53 ++++-
.../operations/CancelRequestOperation.java | 58 ++++++
.../operations/ContainerRequestOperation.java | 3 +-
.../ProviderNotifyingOperationHandler.java | 9 +-
.../operations/RMOperationHandler.java | 4 +-
.../operations/RMOperationHandlerActions.java | 9 +
.../slider/server/appmaster/rpc/RpcBinder.java | 2 +-
.../rpc/SliderClusterProtocolProxy.java | 20 +-
.../slider/server/appmaster/state/AppState.java | 134 +++++++-----
.../appmaster/state/ContainerPriority.java | 37 +++-
.../appmaster/state/ProviderAppState.java | 4 +
.../server/appmaster/state/RoleHistory.java | 6 +-
.../server/appmaster/state/RoleStatus.java | 108 ++++++----
.../state/StateAccessForProviders.java | 3 +-
.../appmaster/web/rest/agent/AgentWebApp.java | 4 +-
.../server/appmaster/web/view/IndexBlock.java | 78 ++++---
.../services/security/CertificateManager.java | 74 ++++++-
.../test_command_log/appConfig.json | 3 +-
.../agent/actions/TestActionExists.groovy | 8 +-
.../standalone/TestStandaloneAMDestroy.groovy | 2 +-
.../standalone/TestStandaloneAMKill.groovy | 2 +-
.../standalone/TestStandaloneAgentAM.groovy | 6 +-
.../TestStandaloneYarnRegistryAM.groovy | 102 +++++-----
.../tools/TestClientResourceRegistration.groovy | 24 ++-
.../slider/common/tools/TestPortScan.groovy | 91 ++++++++-
.../TestMockAppStateRMOperations.groovy | 191 +++++++++++++++--
.../model/mock/MockProviderService.groovy | 9 +
.../model/mock/MockRMOperationHandler.groovy | 22 +-
.../appmaster/web/view/TestIndexBlock.groovy | 32 ++-
.../apache/slider/test/SliderTestUtils.groovy | 204 +++++++++++++------
.../agent/TestAgentProviderService.java | 5 +-
.../abstracttests/AbstractTestBuildSetup.groovy | 1 -
.../framework/AgentCommandTestBase.groovy | 8 +-
.../funtest/framework/CommandTestBase.groovy | 120 ++++++++---
.../slider/funtest/framework/ConfLoader.groovy | 58 +++++-
.../funtest/framework/FuntestProperties.groovy | 14 +-
.../slider/funtest/framework/SliderShell.groovy | 65 +++++-
.../funtest/commands/ResolveCommandIT.groovy | 64 ++++++
.../funtest/commands/SimpleCommandsIT.groovy | 6 +-
.../funtest/lifecycle/AMFailuresIT.groovy | 8 +-
.../lifecycle/AgentClusterLifecycleIT.groovy | 7 +-
.../funtest/lifecycle/AgentFailures2IT.groovy | 2 +-
.../funtest/lifecycle/AgentFailuresIT.groovy | 2 +-
.../funtest/lifecycle/AgentRegistryIT.groovy | 140 +++++++++++++
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 40 +++-
.../AppsThroughAgentQueueAndLabelsIT.groovy | 2 +-
.../accumulo/AccumuloClientProvider.java | 2 +-
.../providers/hbase/HBaseClientProvider.java | 2 +-
79 files changed, 2187 insertions(+), 531 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ec07bdc1/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ec07bdc1/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------
diff --cc slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
index db119bd,21cb6d2..c6bdc91
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
@@@ -28,7 -28,7 +28,8 @@@ import org.apache.hadoop.yarn.api.recor
import org.apache.hadoop.yarn.api.records.ContainerStatus;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
import org.apache.hadoop.yarn.api.records.NodeId;
+import org.apache.hadoop.yarn.api.records.NodeReport;
+ import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.impl.pb.ContainerPBImpl;
import org.apache.hadoop.yarn.client.api.AMRMClient;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ec07bdc1/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
----------------------------------------------------------------------