You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/07/29 12:55:29 UTC

[08/12] stratos git commit: fixing application update and config file

fixing application update and config file


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/56042957
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/56042957
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/56042957

Branch: refs/heads/master
Commit: 5604295788966ed2d6b16f3f5496b2ff859c6cff
Parents: dd3dce6
Author: reka <rt...@gmail.com>
Authored: Mon Jul 27 17:21:09 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Jul 29 16:11:07 2015 +0530

----------------------------------------------------------------------
 .../autoscaler/services/impl/AutoscalerServiceImpl.java       | 7 +++----
 .../org/apache/stratos/common/constants/StratosConstants.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/56042957/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index c3bb2c7..da1abdc 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -184,11 +184,10 @@ public class AutoscalerServiceImpl implements AutoscalerService {
         ApplicationContext existingApplicationContext = AutoscalerContext.getInstance().
                 getApplicationContext(applicationId);
 
-        if (existingApplicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
-
-            //Need to update the application
-            AutoscalerUtil.getInstance().updateApplicationsTopology(application);
+        //Need to update the application
+        AutoscalerUtil.getInstance().updateApplicationsTopology(application);
 
+        if (existingApplicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
             //Update the clusterMonitors
             AutoscalerUtil.getInstance().updateClusterMonitor(application);
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/56042957/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 d95907b..ee0477c 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
@@ -164,7 +164,7 @@ public class StratosConstants {
 
     // member expiry timeout constants
     public static final String PENDING_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingMemberExpiryTimeout";
-    public static final String SPIN_TERMINATE_PARALLEL = "autoscaler.member.pendingMemberExpiryTimeout";
+    public static final String SPIN_TERMINATE_PARALLEL = "autoscaler.member.spinAfterTerminate";
     public static final String OBSOLETED_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.obsoletedMemberExpiryTimeout";
     public static final String PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingTerminationMemberExpiryTimeout";