You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/14 11:02:36 UTC
stratos git commit: Remove un-used scaling dependency from dependency
tree
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 0294db188 -> 35f80b475
Remove un-used scaling dependency from dependency tree
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/35f80b47
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/35f80b47
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/35f80b47
Branch: refs/heads/4.1.0-test
Commit: 35f80b475c5a859d4324094ad5412eb64ece9a8a
Parents: 0294db1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Dec 14 15:34:33 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Dec 14 15:34:33 2014 +0530
----------------------------------------------------------------------
.../applications/dependency/DependencyTree.java | 25 +-------------------
.../component/ParentComponentMonitor.java | 2 +-
2 files changed, 2 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/35f80b47/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
index 1e8b69e..5aace1e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.applications.dependency.context.ApplicationChildContext;
import org.apache.stratos.autoscaler.monitor.Monitor;
import org.apache.stratos.autoscaler.monitor.component.ParentComponentMonitor;
+import org.apache.stratos.messaging.domain.applications.ScalingDependentList;
import java.util.ArrayList;
import java.util.List;
@@ -35,8 +36,6 @@ public class DependencyTree {
private List<ApplicationChildContext> primaryApplicationContextList;
- private List<ApplicationChildContext> scalingDependencyApplicationContextList;
-
private TerminationBehavior terminationBehavior;
private boolean startupOder;
@@ -66,11 +65,6 @@ public class DependencyTree {
}
- public void addScalingApplicationContext(ApplicationChildContext applicationContext) {
- scalingDependencyApplicationContextList.add(applicationContext);
-
- }
-
/**
* Find an ApplicationContext from dependency tree with the given id
*
@@ -82,16 +76,6 @@ public class DependencyTree {
}
/**
- * Find an ApplicationContext from dependency tree with the given id
- *
- * @param id the alias/id of group/cluster
- * @return ApplicationContext of the given id
- */
- public ApplicationChildContext findApplicationContextWithIdInScalingDependencyTree(String id) {
- return findApplicationContextWithId(id, scalingDependencyApplicationContextList);
- }
-
- /**
* Find the ApplicationContext using Breadth first search.
*
* @param id the alias/id of group/cluster
@@ -260,13 +244,6 @@ public class DependencyTree {
return this.getTerminationBehavior() == TerminationBehavior.TERMINATE_ALL;
}
- public List<ApplicationChildContext> getScalingDependencyApplicationContextList() {
- return scalingDependencyApplicationContextList;
- }
-
- public void setScalingDependencyApplicationContextList(List<ApplicationChildContext> scalingDependencyApplicationContextList) {
- this.scalingDependencyApplicationContextList = scalingDependencyApplicationContextList;
- }
public TerminationBehavior getTerminationBehavior() {
return terminationBehavior;
http://git-wip-us.apache.org/repos/asf/stratos/blob/35f80b47/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
index 175e2ee..d85ba90 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
@@ -90,7 +90,7 @@ public abstract class ParentComponentMonitor extends Monitor {
//Building the scaling dependencies for this monitor within the immediate children
scalingDependencies = component.getDependencyOrder().getScalingDependents();
//Create the executor service with identifier and thread pool size
- executorService= StratosThreadPool.getExecutorService(IDENTIFIER, THREAD_POOL_SIZE);
+ executorService = StratosThreadPool.getExecutorService(IDENTIFIER, THREAD_POOL_SIZE);
}
/**