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:26 UTC
[1/5] git commit: add persistance payload from subscription data
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 <ud...@wso2.com>
Authored: Sun Feb 16 23:31:15 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
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;
}
[5/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/9d0b9349
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9d0b9349
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9d0b9349
Branch: refs/heads/master
Commit: 9d0b93496c70921b83225b50d64819c1928e1aa1
Parents: bcc2038 3fd8064
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Feb 17 06:39:55 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Feb 17 06:39:55 2014 -0500
----------------------------------------------------------------------
.../message/receiver/health/AutoscalerHealthStatReceiver.java | 7 ++++++-
.../message/receiver/topology/AutoscalerTopologyReceiver.java | 7 ++++++-
.../topology/receiver/StratosManagerTopologyReceiver.java | 4 ++++
.../message/receiver/health/stat/HealthStatReceiver.java | 7 ++++++-
.../notifier/InstanceNotifierEventMessageReceiver.java | 7 ++++++-
.../messaging/message/receiver/tenant/TenantReceiver.java | 7 ++++++-
.../messaging/message/receiver/topology/TopologyReceiver.java | 7 ++++++-
7 files changed, 40 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/5] git commit: Revert "add persistance payload from subscription
data"
Posted by ud...@apache.org.
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;
}
[4/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/bcc20381
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bcc20381
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bcc20381
Branch: refs/heads/master
Commit: bcc20381647c809f4578a38744848c3789279288
Parents: ff50a0e 78d4c84
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Feb 17 06:25:37 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Feb 17 06:25:37 2014 -0500
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 460 +++++++++----------
.../cloud/controller/iaases/AWSEC2Iaas.java | 51 +-
.../controller/iaases/OpenstackNovaIaas.java | 16 +-
.../impl/CloudControllerServiceImpl.java | 43 +-
.../cloud/controller/pojo/ClusterContext.java | 16 +-
.../util/CloudControllerConstants.java | 1 +
.../stratos/messaging/util/Constants.java | 1 +
pom.xml | 2 +-
8 files changed, 321 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: Mounting volumes script at Agent
Posted by ud...@apache.org.
Mounting volumes script at Agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ff50a0e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ff50a0e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ff50a0e3
Branch: refs/heads/master
Commit: ff50a0e3d35346a10f9747385d64cbe89ad8939d
Parents: 57df7cc
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Feb 17 06:24:52 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Feb 17 06:24:52 2014 -0500
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 3 ++
.../agent/util/CartridgeAgentConstants.java | 1 +
.../cartridge/agent/util/ExtensionUtils.java | 21 ++++++++
.../src/main/extensions/mount_volumes.sh | 56 ++++++++++++++++++++
4 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff50a0e3/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index 5ab6634..3e95da0 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -120,6 +120,9 @@ public class CartridgeAgent implements Runnable {
// Wait for all ports to be active
CartridgeAgentUtils.waitUntilPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts());
+ // Mount persistance volumes.
+ ExtensionUtils.executeVolumeMountExtension();
+
// Check repo url
String repoUrl = CartridgeAgentConfiguration.getInstance().getRepoUrl();
if ("null".equals(repoUrl) || StringUtils.isBlank(repoUrl)) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff50a0e3/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
index f133201..80e3bc2 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
@@ -32,6 +32,7 @@ public class CartridgeAgentConstants implements Serializable{
public static final String INSTANCE_ACTIVATED_SH = "instance-activated.sh";
public static final String ARTIFACTS_UPDATED_SH = "artifacts-updated.sh";
public static final String CLEAN_UP_SH = "clean.sh";
+ public static final String MOUNT_VOLUMES_SH = "mount_volumes.sh";
public static final String CARTRIDGE_KEY = "CARTRIDGE_KEY";
public static final String APP_PATH = "APP_PATH";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff50a0e3/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 e164022..d45ff2b 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
@@ -111,4 +111,25 @@ public class ExtensionUtils {
log.error("Could not execute artifacts updated extension", e);
}
}
+
+ /*
+ This will execute the volume mounting script which format and mount the
+ persistance volumes.
+ */
+ public static void executeVolumeMountExtension() {
+ try {
+ if(log.isDebugEnabled()) {
+ log.debug("Executing volume mounting extension");
+ }
+ String command = prepareCommand(CartridgeAgentConstants.MOUNT_VOLUMES_SH);
+ String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH);
+
+ // add payload file path as argument so inside the script we can source
+ // it to get the env variables set by the startup script
+ CommandUtils.executeCommand(command + " " + payloadPath);
+ }
+ catch (Exception e) {
+ log.error("Could not execute volume mounting extension", e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff50a0e3/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
new file mode 100755
index 0000000..9f91a6b
--- /dev/null
+++ b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+# --------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# --------------------------------------------------------------
+# This extension script will be executed to start the servers.
+# --------------------------------------------------------------
+#
+
+log=/var/log/apache-stratos/cartridge-agent-extensions.log
+echo -e "Starting mounting volumes" | tee -a $log
+
+# $1 refers the payload params file which is passed from Cartridge Agent code.
+source $1
+
+function mount_volume(){
+ echo -e "Formating the device $1 \n"
+ sudo mkfs -t ext4 $1
+
+ echo "Mounting the device $1 to the mount point $2 \n"
+ if [ -d "$DIRECTORY" ]; then
+ echo "creating the directory $2 since it does not exist."
+ mkdir $2
+ fi
+
+ sudo mount $1 $2
+}
+
+IFS='|' read -ra ADDR <<< "$PERSISTANCE_MAPPING"
+for i in "${!ADDR[@]}"; do
+ # expected PERSISTANCE_MAPPING format is device1|mountPoint1|device2|mountpoint2...
+ # so that even indexes are devices and odd indexes are mount points..
+
+ if (( $i % 2 == 0 ))
+ then
+ mount_volume ${ADDR[$i]} ${ADDR[$i + 1]}
+ fi
+done
+
+echo $IFS