You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/02/17 12:40:27 UTC
[2/5] git commit: Revert "add persistance payload from subscription
data"
Revert "add persistance payload from subscription data"
This reverts commit a35816b75206970eebb772e3d0714ae8818ba395.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/57df7cca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/57df7cca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/57df7cca
Branch: refs/heads/master
Commit: 57df7cca93842291dfe89fe560fd32c08a40589a
Parents: a35816b
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Feb 17 01:25:35 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Feb 17 01:25:35 2014 -0500
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/57df7cca/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 3227c94..eeaebf7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -246,11 +246,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
addToPayload(payload, "LB_CLUSTER_ID", memberContext.getLbClusterId());
addToPayload(payload, "NETWORK_PARTITION_ID", memberContext.getNetworkPartitionId());
addToPayload(payload, "PARTITION_ID", partitionId);
-
- if(ctxt.isVolumeRequired()){
- addToPayload(payload, "PERSISTANCE_MAPPING", getPersistancePayload(ctxt).toString());
- }
-
+
+ addToPayload(payload, "PERSISTANCE_MAPPING", getPersistancePayload(cartridge).toString());
+
if (log.isDebugEnabled()) {
log.debug("Payload: " + payload.toString());
}
@@ -371,9 +369,19 @@ public class CloudControllerServiceImpl implements CloudControllerService {
ctxt.setVolumeId(volumeId);
}
- private StringBuilder getPersistancePayload(ClusterContext clusterContext) {
+ private StringBuilder getPersistancePayload(Cartridge cartridge) {
StringBuilder persistancePayload = new StringBuilder();
- persistancePayload.append(clusterContext.getDeviceName());
+ if(isPersistanceMappingAvailable(cartridge)){
+ int i=0;
+ for(; i<cartridge.getPeristanceMappings().size()-1;i++){
+ if(log.isDebugEnabled()){
+ log.debug("Adding persistance mapping " + cartridge.getPeristanceMappings().get(i).toString());
+ }
+ persistancePayload.append(cartridge.getPeristanceMappings().get(i).getDevice());
+ persistancePayload.append("|");
+ }
+ persistancePayload.append(cartridge.getPeristanceMappings().get(i).getDevice());
+ }
return persistancePayload;
}