You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/27 16:41:01 UTC
[1/2] git commit: handling existence of topology artifacts correctly
Repository: incubator-stratos
Updated Branches:
refs/heads/master 90a0f44ff -> 71c537954
handling existence of topology artifacts correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/88a49dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/88a49dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/88a49dc1
Branch: refs/heads/master
Commit: 88a49dc18b393b10805d53b9d6ffbdb64a84159e
Parents: 75d5b26
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Mar 27 21:06:52 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Mar 27 21:06:52 2014 +0530
----------------------------------------------------------------------
.../ClusterCreatedMessageProcessor.java | 1 -
.../ClusterRemovedMessageProcessor.java | 17 ++++++-----
.../InstanceSpawnedMessageProcessor.java | 31 ++++++++++----------
.../MemberActivatedMessageProcessor.java | 26 ++++++++--------
.../MemberMaintenanceModeProcessor.java | 21 ++++++-------
.../MemberReadyToShutdownMessageProcessor.java | 21 ++++++-------
.../topology/MemberStartedMessageProcessor.java | 21 ++++++-------
.../MemberSuspendedMessageProcessor.java | 21 ++++++-------
.../MemberTerminatedMessageProcessor.java | 25 ++++++++--------
.../ServiceCreatedMessageProcessor.java | 19 ++++++------
.../ServiceRemovedMessageProcessor.java | 15 +++++-----
11 files changed, 113 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java
index b8d86a6..c007343 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java
@@ -18,7 +18,6 @@
*/
package org.apache.stratos.messaging.message.processor.topology;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.domain.topology.Cluster;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java
index edbfed1..0e5a56f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java
@@ -86,16 +86,17 @@ public class ClusterRemovedMessageProcessor extends MessageProcessor {
event.getServiceName(),
event.getClusterId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ service.removeCluster(event.getClusterId());
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Cluster removed from service: [service] %s [cluster] %s",
+ event.getServiceName(), event.getClusterId()));
+ }
}
- // Apply changes to the topology
- service.removeCluster(event.getClusterId());
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Cluster removed from service: [service] %s [cluster] %s",
- event.getServiceName(), event.getClusterId()));
- }
// Notify event listeners
notifyEventListeners(event);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
index 2d8bdc1..3bb0532 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
@@ -106,23 +106,24 @@ public class InstanceSpawnedMessageProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ Member member = new Member(event.getServiceName(), event.getClusterId(), event.getNetworkPartitionId(), event.getPartitionId(), event.getMemberId());
+ member.setStatus(MemberStatus.Created);
+ member.setMemberPublicIp(event.getMemberPublicIp());
+ member.setMemberIp(event.getMemberIp());
+ member.setLbClusterId(event.getLbClusterId());
+ cluster.addMember(member);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member created: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- Member member = new Member(event.getServiceName(), event.getClusterId(), event.getNetworkPartitionId(), event.getPartitionId(), event.getMemberId());
- member.setStatus(MemberStatus.Created);
- member.setMemberPublicIp(event.getMemberPublicIp());
- member.setMemberIp(event.getMemberIp());
- member.setLbClusterId(event.getLbClusterId());
- cluster.addMember(member);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member created: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
// Notify event listeners
notifyEventListeners(event);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
index a065b70..a5d701d 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
@@ -134,19 +134,19 @@ public class MemberActivatedMessageProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
- }
-
- // Apply changes to the topology
- member.addPorts(event.getPorts());
- member.setMemberIp(event.getMemberIp());
- member.setStatus(MemberStatus.Activated);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member activated: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
+ } else {
+
+ // Apply changes to the topology
+ member.addPorts(event.getPorts());
+ member.setMemberIp(event.getMemberIp());
+ member.setStatus(MemberStatus.Activated);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member activated: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
// Notify event listeners
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java
index bed6430..b6dc489 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java
@@ -119,18 +119,19 @@ public class MemberMaintenanceModeProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ member.setStatus(MemberStatus.In_Maintenance);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member updated as In_Maintenance: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- member.setStatus(MemberStatus.In_Maintenance);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member updated as In_Maintenance: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
// Notify event listeners
notifyEventListeners(event);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java
index b2e43b8..92115aa 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java
@@ -118,18 +118,19 @@ public class MemberReadyToShutdownMessageProcessor extends MessageProcessor{
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ member.setStatus(MemberStatus.ReadyToShutDown);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member updated as Ready to shutdown: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- member.setStatus(MemberStatus.ReadyToShutDown);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member updated as Ready to shutdown: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
// Notify event listeners
notifyEventListeners(event);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
index c6eb2a7..4d93957 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
@@ -121,18 +121,19 @@ public class MemberStartedMessageProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ member.setStatus(MemberStatus.Starting);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member started: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- member.setStatus(MemberStatus.Starting);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member started: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
// Notify event listeners
notifyEventListeners(event);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
index 4e3faa9..67c9b67 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
@@ -121,18 +121,19 @@ public class MemberSuspendedMessageProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ member.setStatus(MemberStatus.Suspended);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member suspended: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- member.setStatus(MemberStatus.Suspended);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member suspended: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
notifyEventListeners(event);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
index dc14163..4e9b713 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
@@ -120,20 +120,21 @@ public class MemberTerminatedMessageProcessor extends MessageProcessor {
event.getClusterId(),
event.getMemberId()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ member.setStatus(MemberStatus.Terminated);
+ //removing the member from the cluster
+ cluster.removeMember(member);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Member terminated: [service] %s [cluster] %s [member] %s",
+ event.getServiceName(),
+ event.getClusterId(),
+ event.getMemberId()));
+ }
}
- // Apply changes to the topology
- member.setStatus(MemberStatus.Terminated);
- //removing the member from the cluster
- cluster.removeMember(member);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Member terminated: [service] %s [cluster] %s [member] %s",
- event.getServiceName(),
- event.getClusterId(),
- event.getMemberId()));
- }
notifyEventListeners(event);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
index cc2e6cc..2c216f0 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
@@ -64,18 +64,19 @@ public class ServiceCreatedMessageProcessor extends MessageProcessor {
if (topology.serviceExists(event.getServiceName())) {
if (log.isWarnEnabled()) {
log.warn(String.format("Service already created: [service] %s", event.getServiceName()));
- return false;
}
+ } else {
+
+ // Apply changes to the topology
+ Service service = new Service(event.getServiceName(), event.getServiceType());
+ service.addPorts(event.getPorts());
+ topology.addService(service);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Service created: [service] %s", event.getServiceName()));
+ }
}
- // Apply changes to the topology
- Service service = new Service(event.getServiceName(), event.getServiceType());
- service.addPorts(event.getPorts());
- topology.addService(service);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Service created: [service] %s", event.getServiceName()));
- }
notifyEventListeners(event);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88a49dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java
index 3b9e88f..5ea95cd 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java
@@ -67,15 +67,16 @@ public class ServiceRemovedMessageProcessor extends MessageProcessor {
log.warn(String.format("Service does not exist: [service] %s",
event.getServiceName()));
}
- return false;
+ } else {
+
+ // Apply changes to the topology
+ topology.removeService(service);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Service removed: [service] %s", event.getServiceName()));
+ }
}
- // Apply changes to the topology
- topology.removeService(service);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Service removed: [service] %s", event.getServiceName()));
- }
// Notify event listeners
notifyEventListeners(event);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/71c53795
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/71c53795
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/71c53795
Branch: refs/heads/master
Commit: 71c53795454e09077571f9dd231ac2459092f378
Parents: 88a49dc 90a0f44
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Mar 27 21:07:14 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Mar 27 21:07:14 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/cli/Command.java | 2 +-
.../stratos/cli/CommandLineApplication.java | 10 +-
.../apache/stratos/cli/CommandLineService.java | 10 +-
.../apache/stratos/cli/GenericRestClient.java | 15 +-
.../java/org/apache/stratos/cli/RestClient.java | 73 ++--
.../stratos/cli/RestCommandLineService.java | 198 +++++-----
.../apache/stratos/cli/StratosApplication.java | 67 +++-
.../apache/stratos/cli/WebClientWrapper.java | 1 +
.../stratos/cli/commands/SyncCommand.java | 8 +-
.../console/controllers/mycartridges.jag | 15 +
.../console/data/clusters.json | 391 +++++--------------
.../themes/theme1/partials/cartridges.hbs | 107 +++--
.../themes/theme1/partials/mycartridges.hbs | 86 ++--
.../themes/theme1/renderers/cartridges.js | 30 +-
.../console/themes/theme1/renderers/index.js | 45 ++-
.../console/themes/theme1/ui/css/main.css | 9 +
.../console/themes/theme1/ui/js/mycartridges.js | 11 +
.../console/util/utility.jag | 6 +
.../repository/RepositoryNotification.java | 39 +-
.../rest/endpoint/services/ServiceUtils.java | 15 +
.../rest/endpoint/services/StratosAdmin.java | 11 +
21 files changed, 605 insertions(+), 544 deletions(-)
----------------------------------------------------------------------