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 2015/11/01 12:49:16 UTC
[04/14] incubator-slider git commit: SLIDER-82 SLIDER-947 build node
map from yarn update reports; serve via REST/IPC
SLIDER-82 SLIDER-947 build node map from yarn update reports; serve via REST/IPC
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/de040cbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/de040cbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/de040cbb
Branch: refs/heads/develop
Commit: de040cbb87eb8a55bf9eb399422a48266c937ee7
Parents: bf4a397
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 14 15:36:29 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 14 15:36:29 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/api/StatusKeys.java | 1 +
.../org/apache/slider/api/proto/Messages.java | 3344 +++++++++++++++++-
.../slider/api/proto/RestTypeMarshalling.java | 7 +-
.../slider/api/types/ComponentInformation.java | 42 +-
.../slider/api/types/NodeEntryInformation.java | 68 +
.../slider/api/types/NodeInformation.java | 44 +
.../apache/slider/server/appmaster/AMUtils.java | 46 -
.../appmaster/ProtobufClusterServices.java | 30 +
.../server/appmaster/ProtobufRecordFactory.java | 29 -
.../server/appmaster/SliderAppMaster.java | 5 +-
.../management/MetricsAndMonitoring.java | 31 +-
.../appmaster/management/RecordedEvent.java | 58 +
.../operations/RMOperationHandlerActions.java | 7 +-
.../state/AbstractClusterServices.java | 33 +
.../appmaster/state/AbstractRecordFactory.java | 30 -
.../slider/server/appmaster/state/AppState.java | 16 +-
.../server/appmaster/state/NodeEntry.java | 77 +-
.../server/appmaster/state/NodeInstance.java | 59 +-
.../slider/server/appmaster/state/NodeMap.java | 35 +-
.../server/appmaster/state/RoleHistory.java | 66 +-
.../server/appmaster/state/RoleStatus.java | 13 +
.../state/StateAccessForProviders.java | 8 +-
.../slider/server/appmaster/web/WebAppApi.java | 8 +
.../src/main/proto/SliderClusterMessages.proto | 140 +-
.../appmaster/model/mock/MockAppState.groovy | 6 +-
.../model/mock/MockClusterServices.groovy | 30 +
.../model/mock/MockRecordFactory.groovy | 30 -
.../view/TestClusterSpecificationBlock.groovy | 9 +-
.../web/rest/agent/TestAMAgentWebServices.java | 4 +-
.../management/TestAMManagementWebServices.java | 4 +-
30 files changed, 3765 insertions(+), 515 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de040cbb/slider-core/src/main/java/org/apache/slider/api/StatusKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/api/StatusKeys.java b/slider-core/src/main/java/org/apache/slider/api/StatusKeys.java
index 6a0a2fa..8a2c4bb 100644
--- a/slider-core/src/main/java/org/apache/slider/api/StatusKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/api/StatusKeys.java
@@ -32,6 +32,7 @@ public interface StatusKeys {
String STATISTICS_CONTAINERS_PREEMPTED = "containers.failed.preempted";
String STATISTICS_CONTAINERS_LIVE = "containers.live";
String STATISTICS_CONTAINERS_REQUESTED = "containers.requested";
+ String STATISTICS_CONTAINERS_ANTI_AFFINE_PENDING = "containers.anti-affine.pending";
String STATISTICS_CONTAINERS_STARTED = "containers.start.started";
String STATISTICS_CONTAINERS_START_FAILED =
"containers.start.failed";