You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2014/09/03 18:23:01 UTC
git commit: SLIDER-385 move shortlife property to internal
Repository: incubator-slider
Updated Branches:
refs/heads/develop b0b7bd385 -> e9a353c1a
SLIDER-385 move shortlife property to internal
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e9a353c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e9a353c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e9a353c1
Branch: refs/heads/develop
Commit: e9a353c1ab201f1481e224b1e2b3e03188b9b2dc
Parents: b0b7bd3
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Wed Sep 3 09:19:21 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Wed Sep 3 09:19:21 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/slider/api/InternalKeys.java | 11 +++++++++++
.../main/java/org/apache/slider/api/ResourceKeys.java | 13 -------------
.../apache/slider/server/appmaster/state/AppState.java | 5 +++--
3 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9a353c1/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java b/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java
index ad384e2..b58f1c6 100644
--- a/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java
@@ -75,6 +75,17 @@ public interface InternalKeys {
*/
int DEFAULT_INTERNAL_CONTAINER_STARTUP_DELAY = 5000;
/**
+ * Time in seconds before a container is considered long-lived.
+ * Shortlived containers are interpreted as a problem with the role
+ * and/or the host: {@value}
+ */
+ String INTERNAL_CONTAINER_FAILURE_SHORTLIFE =
+ "internal.container.failure.shortlife";
+ /**
+ * Default short life threshold: {@value}
+ */
+ int DEFAULT_INTERNAL_CONTAINER_FAILURE_SHORTLIFE = 60;
+ /**
* Version of the app: {@value}
*/
String KEYTAB_LOCATION = "internal.keytab.location";
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9a353c1/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java b/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java
index 3d54140..b542f1a 100644
--- a/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java
@@ -92,19 +92,6 @@ public interface ResourceKeys {
/**
- * Time in seconds before a container is considered long-lived.
- * Shortlived containers are interpreted as a problem with the role
- * and/or the host: {@value}
- */
- String CONTAINER_FAILURE_SHORTLIFE =
- "container.failure.shortlife";
-
- /**
- * Default short life threshold: {@value}
- */
- int DEFAULT_CONTAINER_FAILURE_SHORTLIFE = 60;
-
- /**
* maximum number of failed containers (in a single role)
* before the cluster is deemed to have failed {@value}
*/
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9a353c1/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------
diff --git 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
index dce48d1..3e6bb74 100644
--- 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
@@ -36,6 +36,7 @@ import org.apache.slider.api.ClusterDescription;
import org.apache.slider.api.ClusterDescriptionKeys;
import org.apache.slider.api.ClusterDescriptionOperations;
import org.apache.slider.api.ClusterNode;
+import org.apache.slider.api.InternalKeys;
import org.apache.slider.api.ResourceKeys;
import org.apache.slider.api.RoleKeys;
import org.apache.slider.api.StatusKeys;
@@ -520,8 +521,8 @@ public class AppState {
instanceDefinition.getResourceOperations().getGlobalOptions();
startTimeThreshold = globalResOpts.getOptionInt(
- ResourceKeys.CONTAINER_FAILURE_SHORTLIFE,
- ResourceKeys.DEFAULT_CONTAINER_FAILURE_SHORTLIFE);
+ InternalKeys.INTERNAL_CONTAINER_FAILURE_SHORTLIFE,
+ InternalKeys.DEFAULT_INTERNAL_CONTAINER_FAILURE_SHORTLIFE);
failureThreshold = globalResOpts.getOptionInt(
ResourceKeys.CONTAINER_FAILURE_THRESHOLD,