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/11/14 10:16:04 UTC
stratos git commit: fixing inActive issue and removing unnecessary
logs
Repository: stratos
Updated Branches:
refs/heads/master 57ab7b4d2 -> fbb0445d6
fixing inActive issue and removing unnecessary logs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fbb0445d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fbb0445d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fbb0445d
Branch: refs/heads/master
Commit: fbb0445d64665e54808081799a152d66563ca596
Parents: 57ab7b4
Author: reka <rt...@gmail.com>
Authored: Fri Nov 14 14:25:07 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Nov 14 14:45:42 2014 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 90 +++++---------------
.../monitor/application/ApplicationMonitor.java | 3 -
.../autoscaler/monitor/group/GroupMonitor.java | 2 +-
.../status/checker/StatusChecker.java | 2 +-
4 files changed, 24 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fbb0445d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
index 5f5b46e..676cf1a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
@@ -87,24 +87,17 @@ public class ApplicationBuilder {
return;
}
- /*try {
- ApplicationHolder.acquireWriteLock();*/
ApplicationStatus status = ApplicationStatus.Active;
if (application.isStateTransitionValid(status)) {
- log.info(String.format("Updating application status: [application-id] %s [status] %s", appId, status));
+ //setting the status, persist and publish
application.setStatus(status);
updateApplicationMonitor(appId, status);
ApplicationHolder.persistApplication(application);
- //publishing data
- //TODO ApplicationsEventPublisher.sendApplicationActivatedEvent(appId);
+ ApplicationsEventPublisher.sendApplicationActivatedEvent(appId);
} else {
log.warn(String.format("Application state transition is not valid: [application-id] %s " +
" [current-status] %s [status-requested] %s", appId, application.getStatus(), status));
}
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
-
}
public static void handleApplicationUndeployed(String appId) {
@@ -125,8 +118,7 @@ public class ApplicationBuilder {
ApplicationHolder.acquireWriteLock();
ApplicationStatus status = ApplicationStatus.Terminating;
if (application.isStateTransitionValid(status)) {
- log.info(String.format("Updating application status: " +
- "[application-id] %s [status] %s", appId, status));
+ //setting the status, persist and publish
application.setStatus(status);
updateApplicationMonitor(appId, status);
ApplicationHolder.persistApplication(application);
@@ -147,8 +139,6 @@ public class ApplicationBuilder {
}
Applications applications = ApplicationHolder.getApplications();
- /*try {
- ApplicationHolder.acquireWriteLock();*/
if (!applications.applicationExists(appId)) {
log.warn("Application does not exist: [application-id] " + appId);
@@ -158,9 +148,7 @@ public class ApplicationBuilder {
ApplicationStatus status = ApplicationStatus.Terminated;
if (application.isStateTransitionValid(status)) {
- // forcefully set status for now
- log.info(String.format("Updating application status: [application-id] %s [status] %s",
- appId, status));
+ //setting the status, persist and publish
application.setStatus(status);
updateApplicationMonitor(appId, status);
//removing the monitor
@@ -175,10 +163,6 @@ public class ApplicationBuilder {
" [current-status] %s [status-requested] %s", appId, application.getStatus(), status));
}
}
-
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
}
public static void handleApplicationTerminatingEvent(String applicationId) {
@@ -200,10 +184,10 @@ public class ApplicationBuilder {
ApplicationStatus status = ApplicationStatus.Terminating;
if (application.isStateTransitionValid(status)) {
// for now anyway update the status forcefully
- log.info(String.format("Updating application status: [application-id] %s [status] %s",
- applicationId, status));
+ //setting the status, persist and publish
application.setStatus(status);
updateApplicationMonitor(applicationId, status);
+ ApplicationHolder.persistApplication(application);
ApplicationsEventPublisher.sendApplicationTerminatingEvent(applicationId);
} else {
log.warn(String.format("Application state transition is not valid: [application-id] %s " +
@@ -236,24 +220,18 @@ public class ApplicationBuilder {
return;
}
- /*try {
- ApplicationHolder.acquireWriteLock();*/
GroupStatus status = GroupStatus.Terminated;
if (group.isStateTransitionValid(status)) {
- log.info(String.format("Updating group status: [group-id] %s [status] %s", groupId, status));
+ //setting the status, persist and publish
group.setStatus(status);
- //updating the groupMonitor
updateGroupMonitor(appId, groupId, status);
- //publishing data
- //TODO ApplicationsEventPublisher.sendGroupTerminatedEvent(appId, groupId);
+ ApplicationHolder.persistApplication(application);
+ ApplicationsEventPublisher.sendGroupTerminatedEvent(appId, groupId);
} else {
log.warn(String.format("Group state transition is not valid: [group-id] %s [current-status] %s " +
" [requested-status] %s", groupId, group.getStatus(), status));
}
- ApplicationHolder.persistApplication(application);
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
+
}
public static void handleGroupActivatedEvent(String appId, String groupId) {
@@ -278,24 +256,17 @@ public class ApplicationBuilder {
return;
}
- /*try {
- ApplicationHolder.acquireWriteLock();*/
GroupStatus status = GroupStatus.Active;
if (group.isStateTransitionValid(status)) {
- log.info(String.format("Updating group status: [group-id] %s [status] %s", groupId, status));
+ //setting the status, persist and publish
group.setStatus(status);
- //updating the groupMonitor
updateGroupMonitor(appId, groupId, status);
- //publishing data
- //TODO ApplicationsEventPublisher.sendGroupActivatedEvent(appId, groupId);
+ ApplicationHolder.persistApplication(application);
+ ApplicationsEventPublisher.sendGroupActivatedEvent(appId, groupId);
} else {
log.warn(String.format("Group state transition is not valid: [group-id] %s [current-status] %s " +
" [requested-status] %s", groupId, group.getStatus(), status));
}
- ApplicationHolder.persistApplication(application);
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
}
public static void handleGroupCreatedEvent(String appId, String groupId) {
@@ -320,25 +291,17 @@ public class ApplicationBuilder {
return;
}
- /*try {
- ApplicationHolder.acquireWriteLock();*/
GroupStatus status = GroupStatus.Created;
if (group.isStateTransitionValid(status)) {
- log.info("Updating group status: [group-id] " + group.getUniqueIdentifier() + " [status] " + status);
+ //setting the status, persist and publish
group.setStatus(status);
- //updating the groupMonitor
updateGroupMonitor(appId, groupId, status);
- //publishing data
- //TODO ApplicationsEventPublisher.sendGroupCreatedEvent(appId, groupId);
+ ApplicationHolder.persistApplication(application);
+ ApplicationsEventPublisher.sendGroupCreatedEvent(appId, groupId);
} else {
log.warn("Group state transition is not valid: [group-id] " + groupId + " [current-state] " + group.getStatus()
+ "[requested-state] " + status);
}
- ApplicationHolder.persistApplication(application);
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
-
}
public static void handleGroupInActivateEvent(String appId, String groupId) {
@@ -363,24 +326,17 @@ public class ApplicationBuilder {
return;
}
- /*try {
- ApplicationHolder.acquireWriteLock();*/
GroupStatus status = GroupStatus.Inactive;
if (group.isStateTransitionValid(status)) {
- log.info("Updating group state: [group-id] " + groupId + " [status] " + status);
+ //setting the status, persist and publish
group.setStatus(status);
- //updating the groupMonitor
updateGroupMonitor(appId, groupId, status);
- //publishing data
- //TODO ApplicationsEventPublisher.sendGroupInActivateEvent(appId, groupId);
+ ApplicationHolder.persistApplication(application);
+ ApplicationsEventPublisher.sendGroupInActivateEvent(appId, groupId);
} else {
log.warn("Group state transition is not valid: [group-id] " + groupId + " [current-state] " + group.getStatus()
+ "[requested-state] " + status);
}
- ApplicationHolder.persistApplication(application);
- /*} finally {
- ApplicationHolder.releaseWriteLock();
- }*/
}
public static void handleGroupTerminatingEvent(String appId, String groupId) {
@@ -409,17 +365,15 @@ public class ApplicationBuilder {
ApplicationHolder.acquireWriteLock();
GroupStatus status = GroupStatus.Terminating;
if (group.isStateTransitionValid(status)) {
- log.info("Updating group status to " + status + ": [group-id] " + group.getUniqueIdentifier());
+ //setting the status, persist and publish
group.setStatus(status);
- //updating the groupMonitor
updateGroupMonitor(appId, groupId, status);
- //publishing data
- //TODO ApplicationsEventPublisher.sendGroupTerminatingEvent(appId, groupId);
+ ApplicationHolder.persistApplication(application);
+ ApplicationsEventPublisher.sendGroupTerminatingEvent(appId, groupId);
} else {
log.warn("Group state transition is not valid: [group-id] " + groupId + " [current-state] " + group.getStatus()
+ "[requested-state] " + status);
}
- ApplicationHolder.persistApplication(application);
} finally {
ApplicationHolder.releaseWriteLock();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fbb0445d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
index 6d76305..25d8fa6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
@@ -140,9 +140,6 @@ public class ApplicationMonitor extends ParentComponentMonitor {
* @param status the status
*/
public void setStatus(ApplicationStatus status) {
- log.info(String.format("[ApplicationMonitor] %s " +
- "state changes from %s to %s", id, this.status, status));
-
this.status = status;
//notify the children about the state change
MonitorStatusEventBuilder.notifyChildren(this, new ApplicationStatusEvent(status, appId));
http://git-wip-us.apache.org/repos/asf/stratos/blob/fbb0445d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
index a49c76e..55ef36f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
@@ -89,7 +89,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
} else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) {
//Check whether all dependent goes Terminated and then start them in parallel.
if (this.inactiveMonitorsList.contains(id)) {
- this.inactiveMonitorsList.remove(id);
+ this.inactiveMonitorsList.remove(id); //TODO remove from monitor map
} else {
log.warn("[monitor] " + id + " cannot be found in the inActive monitors list");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fbb0445d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
index 5b13e42..bab95e9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
@@ -348,7 +348,7 @@ public class StatusChecker {
}
} else if (groups.isEmpty() && getAllClusterInactive(clusterData) ||
clusterData.isEmpty() && getAllGroupInActive(groups) ||
- getAllClusterInactive(clusterData) && getAllGroupInActive(groups)) {
+ getAllClusterInactive(clusterData) || getAllGroupInActive(groups)) {
//send the in activation event
if (parent instanceof Application) {
//send application activated event