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 2014/12/16 06:43:38 UTC
[1/2] stratos git commit: adding correct logs with instanceIds
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 3b49fb848 -> c86bc92b9
adding correct logs with instanceIds
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c86bc92b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c86bc92b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c86bc92b
Branch: refs/heads/4.1.0-test
Commit: c86bc92b96cb0597564325e29b7dad1d54ff4925
Parents: 9cb9a7c
Author: reka <rt...@gmail.com>
Authored: Tue Dec 16 11:13:08 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue Dec 16 11:13:25 2014 +0530
----------------------------------------------------------------------
.../status/processor/group/GroupStatusActiveProcessor.java | 6 ++++--
.../status/processor/group/GroupStatusInactiveProcessor.java | 3 ++-
.../status/processor/group/GroupStatusTerminatedProcessor.java | 6 ++++--
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c86bc92b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
index 69a6bfa..f7a61b6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
@@ -88,12 +88,14 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
//send activation event
if (component instanceof Application) {
//send application activated event
- log.info("sending app activate: " + appId);
+ log.info("sending application active for [application] " + appId + " [instance] "
+ + instanceId);
ApplicationBuilder.handleApplicationInstanceActivatedEvent(appId, instanceId);
return true;
} else if (component instanceof Group) {
//send activation to the parent
- log.info("sending group activate: " + component.getUniqueIdentifier());
+ log.info("sending group instance active for [group] " +
+ component.getUniqueIdentifier() + " [instance] " + instanceId);
ApplicationBuilder.handleGroupInstanceActivatedEvent(appId, component.getUniqueIdentifier(), instanceId);
return true;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c86bc92b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
index 38c9574..105f7e0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
@@ -105,7 +105,8 @@ public class GroupStatusInactiveProcessor extends GroupStatusProcessor {
} else if (component instanceof Group) {
//send activation to the parent
if (((Group) component).getStatus(instanceId) != GroupStatus.Inactive) {
- log.info("sending group inactive: " + component.getUniqueIdentifier());
+ log.info("sending group instance Inactive for [group] " +
+ component.getUniqueIdentifier() + " [instance] " + instanceId);
ApplicationBuilder.handleGroupInactivateEvent(appId, component.getUniqueIdentifier(), instanceId);
return true;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c86bc92b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
index 578037d..3d786df 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
@@ -91,11 +91,13 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
getAllGroupInSameState(groups, GroupStatus.Terminated, instanceId)) {
//send the terminated event
if (component instanceof Application) {
- log.info("sending app terminated: " + appId);
+ log.info("sending application terminated for [application] " + appId + " [instance] "
+ + instanceId);
ApplicationBuilder.handleApplicationInstanceTerminatedEvent(appId, instanceId);
return true;
} else if (component instanceof Group) {
- log.info("sending group terminated : " + component.getUniqueIdentifier());
+ log.info("sending group instance terminated for [group] " +
+ component.getUniqueIdentifier() + " [instance] " + instanceId);
ApplicationBuilder.handleGroupInstanceTerminatedEvent(appId,
component.getUniqueIdentifier(), instanceId);
return true;
[2/2] stratos git commit: fixing group scaling issue
Posted by re...@apache.org.
fixing group scaling issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9cb9a7c4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9cb9a7c4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9cb9a7c4
Branch: refs/heads/4.1.0-test
Commit: 9cb9a7c4d3b26c0fa521a5ee833ccd460638fd24
Parents: 3b49fb8
Author: reka <rt...@gmail.com>
Authored: Tue Dec 16 11:05:44 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue Dec 16 11:13:25 2014 +0530
----------------------------------------------------------------------
.../autoscaler/applications/parser/DefaultApplicationParser.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9cb9a7c4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 4a04278..fbde278 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -465,7 +465,6 @@ public class DefaultApplicationParser implements ApplicationParser {
group.setGroupScalingEnabled(isGroupScalingEnabled(groupCtxt.getName(),serviceGroup));
group.setGroupMinInstances(groupCtxt.getGroupMinInstances());
group.setGroupMaxInstances(groupCtxt.getGroupMaxInstances());
- group.setGroupScalingEnabled(groupCtxt.isGroupScalingEnabled());
DependencyOrder dependencyOrder = new DependencyOrder();
// create the Dependency Ordering
String [] startupOrders = getStartupOrderForGroup(groupCtxt.getName(),serviceGroup);