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/12 15:01:43 UTC
[1/2] incubator-slider git commit: SLIDER-982 chaos monkey to not log
@ info if its not actually active
Repository: incubator-slider
Updated Branches:
refs/heads/develop c4e732915 -> b201de8ad
SLIDER-982 chaos monkey to not log @ info if its not actually active
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ca6f9cee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ca6f9cee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ca6f9cee
Branch: refs/heads/develop
Commit: ca6f9cee09b4b6c7b6dee83bdd06268e8ddd4d50
Parents: c4e7329
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 12 13:58:50 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 12 14:01:31 2015 +0000
----------------------------------------------------------------------
.../slider/server/appmaster/SliderAppMaster.java | 2 +-
.../server/appmaster/monkey/ChaosKillContainer.java | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ca6f9cee/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git 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
index df91d7f..3d062b5 100644
--- 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
@@ -2206,7 +2206,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
internals.getOptionBool(InternalKeys.CHAOS_MONKEY_ENABLED,
InternalKeys.DEFAULT_CHAOS_MONKEY_ENABLED);
if (!enabled) {
- log.info("Chaos monkey disabled");
+ log.debug("Chaos monkey disabled");
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ca6f9cee/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java
index a5cdfc6..ae38e4c 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java
@@ -72,15 +72,13 @@ public class ChaosKillContainer implements ChaosTarget {
}
}
int size = liveContainers.size();
- if (size <= 0) {
- log.info("No containers to kill");
- return;
- }
- int target = random.nextInt(size);
- RoleInstance roleInstance = liveContainers.get(target);
- log.info("Killing {}", roleInstance);
+ if (size > 0) {
+ int target = random.nextInt(size);
+ RoleInstance roleInstance = liveContainers.get(target);
+ log.info("Killing {}", roleInstance);
- queues.schedule(new ActionKillContainer(roleInstance.getId(),
- DELAY, TimeUnit.MILLISECONDS, operationHandler));
+ queues.schedule(new ActionKillContainer(roleInstance.getId(),
+ DELAY, TimeUnit.MILLISECONDS, operationHandler));
+ }
}
}
[2/2] incubator-slider git commit: SLIDER-981 Build and test slider
against Hadoop 2.7.2 RC0 -allow for staging URL to be defined on CLI
Posted by st...@apache.org.
SLIDER-981 Build and test slider against Hadoop 2.7.2 RC0 -allow for staging URL to be defined on CLI
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b201de8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b201de8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b201de8a
Branch: refs/heads/develop
Commit: b201de8ade387dbd5550b35060ca001d2af4362b
Parents: ca6f9ce
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 12 13:59:36 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 12 14:01:41 2015 +0000
----------------------------------------------------------------------
pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b201de8a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 866c448..289993c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,17 +234,21 @@
<github.site.plugin.version>0.8</github.site.plugin.version>
<maven-site-plugin.skipDeploy>true</maven-site-plugin.skipDeploy>
<github.downloads.plugin.version>0.6</github.downloads.plugin.version>
+
+ <!-- override point for ASF staging/snapshot repos -->
+ <asf.staging>https://repository.apache.org/content/groups/staging/</asf.staging>
+ <asf.snapshots>https://repository.apache.org/content/repositories/snapshots/</asf.snapshots>
</properties>
<repositories>
<repository>
<id>ASF Staging</id>
- <url>https://repository.apache.org/content/groups/staging/</url>
+ <url>${asf.staging}</url>
</repository>
<repository>
<id>ASF Snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <url>${asf.snapshots}</url>
<snapshots>
<enabled>true</enabled>
</snapshots>