Repository: incubator-stratos Updated Branches: refs/heads/master 3fd80640b -> 9d0b93496
add persistance payload from subscription data Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a35816b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a35816b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a35816b7 Branch: refs/heads/master Commit: a35816b75206970eebb772e3d0714ae8818ba395 Parents: dfd32f2 Author: Udara Liyanage <[email protected]> Authored: Sun Feb 16 23:31:15 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Sun Feb 16 23:31:15 2014 -0500 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a35816b7/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 eeaebf7..3227c94 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,9 +246,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { addToPayload(payload, "LB_CLUSTER_ID", memberContext.getLbClusterId()); addToPayload(payload, "NETWORK_PARTITION_ID", memberContext.getNetworkPartitionId()); addToPayload(payload, "PARTITION_ID", partitionId); - - addToPayload(payload, "PERSISTANCE_MAPPING", getPersistancePayload(cartridge).toString()); - + + if(ctxt.isVolumeRequired()){ + addToPayload(payload, "PERSISTANCE_MAPPING", getPersistancePayload(ctxt).toString()); + } + if (log.isDebugEnabled()) { log.debug("Payload: " + payload.toString()); } @@ -369,19 +371,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { ctxt.setVolumeId(volumeId); } - private StringBuilder getPersistancePayload(Cartridge cartridge) { + private StringBuilder getPersistancePayload(ClusterContext clusterContext) { StringBuilder persistancePayload = new StringBuilder(); - 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()); - } + persistancePayload.append(clusterContext.getDeviceName()); return persistancePayload; }
