Repository: stratos Updated Branches: refs/heads/master 7bacd9e54 -> e2815f679
Fixing STRATOS-891 - different monitor intervals for different cluster monitors Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e2815f67 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e2815f67 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e2815f67 Branch: refs/heads/master Commit: e2815f679ef4992147ffd70e842126249e01f6cd Parents: 7bacd9e Author: R-Rajkumar <[email protected]> Authored: Sat Oct 25 11:49:23 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Sat Oct 25 11:49:23 2014 +0530 ---------------------------------------------------------------------- .../monitor/KubernetesServiceClusterMonitor.java | 4 ++-- .../autoscaler/monitor/VMLbClusterMonitor.java | 4 ++-- .../monitor/VMServiceClusterMonitor.java | 4 ++-- .../autoscaler/util/AutoScalerConstants.java | 6 ++++-- .../distribution/src/main/conf/autoscaler.xml | 19 +++++++++++++++---- 5 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e2815f67/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/KubernetesServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/KubernetesServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/KubernetesServiceClusterMonitor.java index c0a435c..67850ba 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/KubernetesServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/KubernetesServiceClusterMonitor.java @@ -146,10 +146,10 @@ public final class KubernetesServiceClusterMonitor extends KubernetesClusterMoni @Override protected void readConfigurations() { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); - int monitorInterval = conf.getInt(AutoScalerConstants.AUTOSCALER_MONITOR_INTERVAL, 90000); + int monitorInterval = conf.getInt(AutoScalerConstants.KubernetesService_Cluster_MONITOR_INTERVAL, 60000); setMonitorIntervalMilliseconds(monitorInterval); if (log.isDebugEnabled()) { - log.debug("KubernetesServiceClusterMonitor task interval: " + getMonitorIntervalMilliseconds()); + log.debug("KubernetesServiceClusterMonitor task interval set to : " + getMonitorIntervalMilliseconds()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/e2815f67/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMLbClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMLbClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMLbClusterMonitor.java index af8cf47..2ed78f1 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMLbClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMLbClusterMonitor.java @@ -125,10 +125,10 @@ public class VMLbClusterMonitor extends VMClusterMonitor { @Override protected void readConfigurations() { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); - int monitorInterval = conf.getInt(AutoScalerConstants.AUTOSCALER_MONITOR_INTERVAL, 90000); + int monitorInterval = conf.getInt(AutoScalerConstants.VMLb_Cluster_MONITOR_INTERVAL, 90000); setMonitorIntervalMilliseconds(monitorInterval); if (log.isDebugEnabled()) { - log.debug("VMLbClusterMonitor task interval: " + getMonitorIntervalMilliseconds()); + log.debug("VMLbClusterMonitor task interval set to : " + getMonitorIntervalMilliseconds()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/e2815f67/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMServiceClusterMonitor.java index 6492490..9aec279 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/VMServiceClusterMonitor.java @@ -185,10 +185,10 @@ public class VMServiceClusterMonitor extends VMClusterMonitor { @Override protected void readConfigurations() { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); - int monitorInterval = conf.getInt(AutoScalerConstants.AUTOSCALER_MONITOR_INTERVAL, 90000); + int monitorInterval = conf.getInt(AutoScalerConstants.VMService_Cluster_MONITOR_INTERVAL, 90000); setMonitorIntervalMilliseconds(monitorInterval); if (log.isDebugEnabled()) { - log.debug("VMServiceClusterMonitor task interval: " + getMonitorIntervalMilliseconds()); + log.debug("VMServiceClusterMonitor task interval set to : " + getMonitorIntervalMilliseconds()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/e2815f67/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 c150f75..b68f16d 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 @@ -42,9 +42,11 @@ public final class AutoScalerConstants { /** - * Configs + * Cluster monitoring interval */ - public static final String AUTOSCALER_MONITOR_INTERVAL = "autoscaler.monitorInterval"; + 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/e2815f67/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 0758c6d..aa45a5c 100644 --- a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml +++ b/products/stratos/modules/distribution/src/main/conf/autoscaler.xml @@ -38,12 +38,23 @@ <clientTimeout>300000</clientTimeout> </stratosManager> <member> - <!-- this is the maximum time a member can be in pending member state --> + <!-- this is the maximum time(ms) a member can be in pending member state --> <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout> - <!-- this is the maximum time a member can be in obsoleted member state --> + <!-- this is the maximum time(ms) a member can be in obsoleted member state --> <obsoletedMemberExpiryTimeout>86400000</obsoletedMemberExpiryTimeout> </member> - <!-- monitor task interval --> - <monitorInterval>60000</monitorInterval> + <!-- 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> </autoscaler> </configuration>
