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/11/17 13:50:01 UTC
[1/2] incubator-slider git commit: format tweaking hbase/README.md
Repository: incubator-slider
Updated Branches:
refs/heads/develop bb873fdee -> 81cd546bd
format tweaking hbase/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f529af2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f529af2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f529af2c
Branch: refs/heads/develop
Commit: f529af2cb9beb2e6f6b7dbf7964bf30d79037b3d
Parents: bb873fd
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 17 13:47:49 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 17 13:47:49 2014 +0100
----------------------------------------------------------------------
app-packages/hbase/README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f529af2c/app-packages/hbase/README.md
----------------------------------------------------------------------
diff --git a/app-packages/hbase/README.md b/app-packages/hbase/README.md
index 2d52fc9..aed919a 100644
--- a/app-packages/hbase/README.md
+++ b/app-packages/hbase/README.md
@@ -41,7 +41,8 @@ Example:
-Dpkg.src=/Users/user1/Downloads/0.98.5-hadoop2
App package can be found in
- app-packages/hbase/target/slider-hbase-app-package-${pkg.version}.zip
+
+ app-packages/hbase/target/slider-hbase-app-package-${pkg.version}.zip
## OPTION - II
[2/2] incubator-slider git commit: SLIDER-654 TestStandaloneAgentAM
failing
Posted by st...@apache.org.
SLIDER-654 TestStandaloneAgentAM failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/81cd546b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/81cd546b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/81cd546b
Branch: refs/heads/develop
Commit: 81cd546bddb2f2ce25475ff0d42a1fdfc6f5ae2a
Parents: f529af2
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 17 13:47:18 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 17 13:49:23 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/client/SliderClient.java | 4 ++++
.../agent/standalone/TestStandaloneAgentAM.groovy | 14 +++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/81cd546b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 94fc32c..21c4965 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -3361,6 +3361,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
serviceclassPath(currentUser(), SliderKeys.APP_TYPE));
return new ArrayList<String>(recordMap.keySet());
/// JDK7 } catch (YarnException | IOException e) {
+ } catch (PathNotFoundException e) {
+ log.debug("No registry path for slider instances for current user: {}", e, e);
+ // no entries: return an empty list
+ return new ArrayList<String>(0);
} catch (IOException e) {
throw e;
} catch (YarnException e) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/81cd546b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index c31e9d3..160f4b7 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -30,6 +30,7 @@ import org.apache.slider.api.ClusterNode
import org.apache.slider.client.SliderClient
import org.apache.slider.common.SliderKeys
import org.apache.slider.common.params.ActionRegistryArgs
+import org.apache.slider.common.tools.Duration
import org.apache.slider.core.build.InstanceBuilder
import org.apache.slider.core.conf.AggregateConf
import org.apache.slider.core.exceptions.SliderException
@@ -110,9 +111,20 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
//switch to the slider ZK-based registry
describe "service registry instance IDs"
- def instanceIds = client.listRegisteredSliderInstances()
+ // iterate waiting for registry to come up
+ List<String> instanceIds = []
+ Duration duration = new Duration(10000)
+ duration.start()
+
+ while (!duration.limitExceeded && instanceIds.size() < 1) {
+ instanceIds = client.listRegisteredSliderInstances()
+ if (!instanceIds.size()) {
+ sleep(500)
+ }
+ }
log.info("number of instanceIds: ${instanceIds.size()}")
+ assert instanceIds.size() >= 1
instanceIds.each { String it -> log.info(it) }
describe "Yarn registry"