You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/12 09:29:29 UTC
stratos git commit: updating autoscaler xml to cope with latest
changes
Repository: stratos
Updated Branches:
refs/heads/master d383bd2f4 -> 4956bcdce
updating autoscaler xml to cope with latest changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4956bcdc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4956bcdc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4956bcdc
Branch: refs/heads/master
Commit: 4956bcdcecd3887394ad6aa7fa36adceace968fd
Parents: d383bd2
Author: R-Rajkumar <rr...@gmail.com>
Authored: Thu Feb 12 13:58:53 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Thu Feb 12 13:58:53 2015 +0530
----------------------------------------------------------------------
.../client/CloudControllerClient.java | 2 +-
.../partition/ClusterLevelPartitionContext.java | 6 ++--
.../partition/GroupLevelPartitionContext.java | 15 ++++++---
.../monitor/cluster/ClusterMonitor.java | 2 +-
.../autoscaler/util/AutoscalerConstants.java | 5 +--
.../common/constants/StratosConstants.java | 7 ++--
.../distribution/src/main/conf/autoscaler.xml | 35 ++++++--------------
7 files changed, 31 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
index d96cbba..5279f44 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
@@ -149,7 +149,7 @@ public class CloudControllerClient {
}
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- long expiryTime = conf.getLong(StratosConstants.OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ long expiryTime = conf.getLong(StratosConstants.OBSOLETED_MEMBER_EXPIRY_TIMEOUT, 86400000);
if (log.isDebugEnabled()) {
log.debug("Member obsolete expiry time is set to: " + expiryTime);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
index 0dfb608..0287f5a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
@@ -96,11 +96,13 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
terminationPendingStartedTime = new HashMap<String, Long>();
// check if a different value has been set for expiryTime
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- pendingMemberExpiryTime = conf.getLong(StratosConstants.PENDING_VM_MEMBER_EXPIRY_TIMEOUT, 900000);
- obsoltedMemberExpiryTime = conf.getLong(StratosConstants.OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ pendingMemberExpiryTime = conf.getLong(StratosConstants.PENDING_MEMBER_EXPIRY_TIMEOUT, 900000);
+ obsoltedMemberExpiryTime = conf.getLong(StratosConstants.OBSOLETED_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ terminationPendingMemberExpiryTime = conf.getLong(StratosConstants.PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT, 1800000);
if (log.isDebugEnabled()) {
log.debug("Member expiry time is set to: " + pendingMemberExpiryTime);
log.debug("Member obsoleted expiry time is set to: " + obsoltedMemberExpiryTime);
+ log.debug("Member pending termination expiry time is set to: " + terminationPendingMemberExpiryTime);
}
Thread th = new Thread(new PendingMemberWatcher(this));
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
index 6a6b93f..a149354 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
@@ -93,11 +93,13 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
terminationPendingStartedTime = new HashMap<String, Long>();
// check if a different value has been set for expiryTime
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- pendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_VM_MEMBER_EXPIRY_TIMEOUT, 900000);
- obsoltedInstanceExpiryTime = conf.getLong(StratosConstants.OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ pendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_MEMBER_EXPIRY_TIMEOUT, 900000);
+ obsoltedInstanceExpiryTime = conf.getLong(StratosConstants.OBSOLETED_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ terminationPendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT, 1800000);
if (log.isDebugEnabled()) {
log.debug("Instance expiry time is set to: " + pendingInstanceExpiryTime);
log.debug("Instance obsoleted expiry time is set to: " + obsoltedInstanceExpiryTime);
+ log.debug("Instance pending termination expiry time is set to: " + terminationPendingInstanceExpiryTime);
}
/*Thread th = new Thread(new PendingInstanceWatcher(this));
@@ -120,11 +122,14 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
terminationPendingStartedTime = new HashMap<String, Long>();
// check if a different value has been set for expiryTime
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- pendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_VM_MEMBER_EXPIRY_TIMEOUT, 900000);
- obsoltedInstanceExpiryTime = conf.getLong(StratosConstants.OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ pendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_MEMBER_EXPIRY_TIMEOUT, 900000);
+ obsoltedInstanceExpiryTime = conf.getLong(StratosConstants.OBSOLETED_MEMBER_EXPIRY_TIMEOUT, 86400000);
+ terminationPendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT, 1800000);
+
if (log.isDebugEnabled()) {
log.debug("Instance expiry time is set to: " + pendingInstanceExpiryTime);
- log.debug("Instance obsoleted expiry time is set to: " + obsoltedInstanceExpiryTime);
+ log.debug("Instance obsolete expiry time is set to: " + obsoltedInstanceExpiryTime);
+ log.debug("Instance pending termination expiry time is set to: " + terminationPendingInstanceExpiryTime);
}
/*Thread th = new Thread(new PendingInstanceWatcher(this));
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index e212eda..e2db9e6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -601,7 +601,7 @@ public class ClusterMonitor extends Monitor implements Runnable {
private void readConfigurations() {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- int monitorInterval = conf.getInt(AutoscalerConstants.VMService_Cluster_MONITOR_INTERVAL, 90000);
+ int monitorInterval = conf.getInt(AutoscalerConstants.Cluster_MONITOR_INTERVAL, 90000);
setMonitorIntervalMilliseconds(monitorInterval);
if (log.isDebugEnabled()) {
log.debug("ClusterMonitor task interval set to : " + getMonitorIntervalMilliseconds());
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java
index 6f48600..370e836 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java
@@ -53,12 +53,9 @@ public final class AutoscalerConstants {
/**
* Cluster monitoring interval
*/
- public static final String AUTOSCALER_MONITOR_INTERVAL = "autoscaler.monitorInterval";
+ public static final String Cluster_MONITOR_INTERVAL = "autoscaler.cluster.monitorInterval";
public static final String SERVICE_GROUP = "/groups";
- public static final String VMService_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.vm.service";
- public static final String VMLb_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.vm.lb";
- public static final String KubernetesService_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.kubernetes.service";
/**
* PortRange min max
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index df1ea8c..8bc59ad 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@ -161,9 +161,10 @@ public class StratosConstants {
// Policy and definition related constants
public static final int PUBLIC_DEFINITION = 0;
- // Autoscaler member timeout constants
- public static final String PENDING_VM_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.vm.pendingMemberExpiryTimeout";
- public static final String OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.vm.obsoletedMemberExpiryTimeout";
+ // member expiry timeout constants
+ public static final String PENDING_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingMemberExpiryTimeout";
+ public static final String OBSOLETED_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.obsoletedMemberExpiryTimeout";
+ public static final String PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingTerminationMemberExpiryTimeout";
public static final String FILTER_VALUE_SEPARATOR = ",";
public static final String TOPOLOGY_SERVICE_FILTER = "stratos.topology.service.filter";
http://git-wip-us.apache.org/repos/asf/stratos/blob/4956bcdc/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml b/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
index d298ead..502a045 100644
--- a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
+++ b/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
@@ -38,32 +38,17 @@
<clientTimeout>300000</clientTimeout>
</stratosManager>
<member>
- <vm>
- <!-- this is the maximum time(ms) a vm member can be in pending member state -->
- <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout>
- <!-- this is the maximum time(ms) a vm member can be in obsoleted member state -->
- <obsoletedMemberExpiryTimeout>86400000</obsoletedMemberExpiryTimeout>
- </vm>
- <container>
- <!-- this is the maximum time(ms) a container member can be in pending member state -->
- <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout>
- <!-- this is the maximum time(ms) a container member can be in obsoleted member state -->
- <obsoletedMemberExpiryTimeout>3600000</obsoletedMemberExpiryTimeout>
- </container>
+ <!-- this is the maximum time(ms) a member can be in pending member state -->
+ <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout>
+ <!-- this is the maximum time(ms) a member can be in obsoleted member state -->
+ <obsoletedMemberExpiryTimeout>86400000</obsoletedMemberExpiryTimeout>
+ <!-- this is the maximum time(ms) a member can be in pending termination member state -->
+ <pendingTerminationMemberExpiryTimeout>86400000</pendingTerminationMemberExpiryTimeout>
</member>
- <!-- cluster monitoring interval -->
- <monitorInterval>
- <vm>
- <!-- VM Service cluster monitoring interval(ms) -->
- <service>90000</service>
- <!-- VM LB cluster monitoring interval(ms) -->
- <lb>90000</lb>
- </vm>
- <kubernetes>
- <!-- Kubernetes Service cluster monitoring interval(ms) -->
- <service>60000</service>
- </kubernetes>
- </monitorInterval>
+ <cluster>
+ <!-- cluster monitoring interval (ms) -->
+ <monitorInterval>1800000</monitorInterval>
+ </cluster>
<threadpool>
<identifier>Autoscaler</identifier>
<threadPoolSize>10</threadPoolSize>