You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/12 02:58:18 UTC
[30/50] 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/851f4474
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/851f4474
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/851f4474
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 851f447484cd291eec21bb576f75ba0ad6f60565
Parents: 66957d4 3b32b8f
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 8 15:51:53 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 8 15:51:53 2014 -0700
----------------------------------------------------------------------
app-packages/hbase-win/metainfo.xml | 2 -
app-packages/hbase/metainfo.xml | 4 -
app-packages/hbase/pom.xml | 1 +
app-packages/storm/metainfo.xml | 3 +
.../org/apache/slider/client/SliderClient.java | 20 +++--
.../providers/AbstractClientProvider.java | 4 +-
.../providers/agent/AgentClientProvider.java | 79 +++++++++++++++-----
.../slider/providers/agent/AgentKeys.java | 2 +-
.../providers/agent/AgentProviderService.java | 43 ++++++++---
.../agent/application/metadata/Component.java | 28 +++++++
.../agent/application/metadata/Metainfo.java | 19 +++++
.../slideram/SliderAMClientProvider.java | 4 +-
.../server/appmaster/SliderAppMaster.java | 2 +-
.../providers/agent/TestBuildBasicAgent.groovy | 65 ++++++++++++++--
.../agent/TestAgentClientProvider.java | 2 +-
.../publisher/TestAgentProviderService.java | 1 +
slider-core/src/test/python/metainfo.xml | 21 ++++++
.../providers/agent/tests/bad/resources-3.json | 13 ++++
.../providers/agent/tests/good/resources.json | 4 +-
.../accumulo/AccumuloClientProvider.java | 4 +-
.../accumulo/AccumuloProviderService.java | 2 +-
.../providers/hbase/HBaseClientProvider.java | 4 +-
.../providers/hbase/HBaseProviderService.java | 4 +-
23 files changed, 264 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/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 a920a3e,31a9a28..6a3f48b
--- 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
@@@ -815,9 -809,11 +815,9 @@@ public class SliderAppMaster extends Ab
appState.noteAMLaunched();
-- //Give the provider restricted access to the state, registry
- providerService.bind(stateForProviders, registry, actionQueues,
- liveContainers);
- sliderAMProvider.bind(stateForProviders, registry, actionQueues,
- liveContainers);
++ //Give the provider access to the state, and AM
+ providerService.bind(stateForProviders, actionQueues, liveContainers);
+ sliderAMProvider.bind(stateForProviders, actionQueues, liveContainers);
// chaos monkey
maybeStartMonkey();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/publisher/TestAgentProviderService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
----------------------------------------------------------------------