You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/23 11:05:45 UTC
[08/11] stratos git commit: JCA - Refactored member checking in
ExtensionUtils
JCA - Refactored member checking in ExtensionUtils
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5f81af3f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5f81af3f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5f81af3f
Branch: refs/heads/master
Commit: 5f81af3f3f6c350d3ab271035368cbda8b0a8b97
Parents: 1a8e7a6
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Mon Feb 23 12:31:29 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Feb 23 15:35:34 2015 +0530
----------------------------------------------------------------------
.../extensions/DefaultExtensionHandler.java | 5 +-
.../cartridge/agent/util/ExtensionUtils.java | 61 +++++++++-----------
2 files changed, 29 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f81af3f/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
index 8112d47..e4d22b6 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
@@ -285,9 +285,8 @@ public class DefaultExtensionHandler implements ExtensionHandler {
String clusterIdInPayload = CartridgeAgentConfiguration.getInstance().getClusterId();
String memberIdInPayload = CartridgeAgentConfiguration.getInstance().getMemberId();
-// boolean memberInitialized = ExtensionUtils.checkTopologyConsistency(serviceNameInPayload, clusterIdInPayload, memberIdInPayload);
- boolean memberExists = ExtensionUtils.memberExistsInTopology(serviceNameInPayload, clusterIdInPayload, memberIdInPayload);
- if (!memberExists) {
+ Member activatedMember = ExtensionUtils.getMemberFromTopology(serviceNameInPayload, clusterIdInPayload, memberIdInPayload);
+ if (activatedMember == null) {
// if this member isn't there in the complete topology
if (log.isDebugEnabled()) {
log.debug("Member does not exist in topology, or not in initialized state.");
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f81af3f/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index 2164f9c..f395af7 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -487,31 +487,17 @@ public class ExtensionUtils {
}
}
+ /**
+ * Check if the specified member is in the topology and is in MemberStatus.Initialized state
+ * @param serviceName
+ * @param clusterId
+ * @param memberId
+ * @return true if member is present in the topology and in initialized state, false otherwise
+ */
public static boolean checkTopologyConsistency(String serviceName, String clusterId, String memberId) {
- Topology topology = TopologyManager.getTopology();
- Service service = topology.getService(serviceName);
- if (service == null) {
- if (log.isErrorEnabled()) {
- log.error(String.format("Service not found in topology [service] %s", serviceName));
- }
- return false;
- }
-
- Cluster cluster = service.getCluster(clusterId);
- if (cluster == null) {
- if (log.isErrorEnabled()) {
- log.error(String.format("Cluster id not found in topology [cluster] %s", clusterId));
- }
- return false;
- }
- Member activatedMember = cluster.getMember(memberId);
- if (activatedMember == null) {
- if (log.isErrorEnabled()) {
- log.error(String.format("Member id not found in topology [member] %s", memberId));
- }
- return false;
- } else if (activatedMember.getStatus() != MemberStatus.Initialized) {
+ Member activatedMember = getMemberFromTopology(serviceName, clusterId, memberId);
+ if (activatedMember.getStatus() != MemberStatus.Initialized) {
if (log.isErrorEnabled()) {
log.error(String.format("Member found in topology, but not in initialized state [member] %s", memberId));
}
@@ -521,32 +507,39 @@ public class ExtensionUtils {
return true;
}
- public static boolean memberExistsInTopology(String serviceNameInPayload, String clusterIdInPayload, String memberIdInPayload) {
+ /**
+ * Gets the specified member from the topology
+ * @param serviceName
+ * @param clusterId
+ * @param memberId
+ * @return {@link org.apache.stratos.messaging.domain.topology.Member} if member is in the topology, null otherwise
+ */
+ public static Member getMemberFromTopology(String serviceName, String clusterId, String memberId) {
Topology topology = TopologyManager.getTopology();
- Service service = topology.getService(serviceNameInPayload);
+ Service service = topology.getService(serviceName);
if (service == null) {
if (log.isErrorEnabled()) {
- log.error(String.format("Service not found in topology [service] %s", serviceNameInPayload));
+ log.error(String.format("Service not found in topology [service] %s", serviceName));
}
- return false;
+ return null;
}
- Cluster cluster = service.getCluster(clusterIdInPayload);
+ Cluster cluster = service.getCluster(clusterId);
if (cluster == null) {
if (log.isErrorEnabled()) {
- log.error(String.format("Cluster id not found in topology [cluster] %s", clusterIdInPayload));
+ log.error(String.format("Cluster id not found in topology [cluster] %s", clusterId));
}
- return false;
+ return null;
}
- Member activatedMember = cluster.getMember(memberIdInPayload);
+ Member activatedMember = cluster.getMember(memberId);
if (activatedMember == null) {
if (log.isErrorEnabled()) {
- log.error(String.format("Member id not found in topology [member] %s", memberIdInPayload));
+ log.error(String.format("Member id not found in topology [member] %s", memberId));
}
- return false;
+ return null;
}
- return true;
+ return activatedMember;
}
}