Fixing STRATOS-453

Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6207e281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6207e281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6207e281

Branch: refs/heads/master
Commit: 6207e2815439e94b1f0ce00c9cd87b6e81ea8f45
Parents: 4b95ade
Author: Melan Nimesh <[email protected]>
Authored: Mon Feb 17 18:39:09 2014 +0530
Committer: Melan Nimesh <[email protected]>
Committed: Mon Feb 17 18:39:09 2014 +0530

----------------------------------------------------------------------
 .../cloud/controller/impl/CloudControllerServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6207e281/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..9a4c24e 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
@@ -335,7 +335,13 @@ public class CloudControllerServiceImpl implements 
CloudControllerService {
                                                .substring(nodeId.indexOf('/') 
+ 1, nodeId.length())
                                                : nodeId;
                                memberContext.setInstanceId(instanceId);
-                               iaas.attachVolume(instanceId, 
ctxt.getVolumeId(), ctxt.getDeviceName());
+                               try {
+                                       iaas.attachVolume(instanceId, 
ctxt.getVolumeId(),
+                                                       ctxt.getDeviceName());
+                               } catch (Exception e) {
+                                       //continue without throwing an 
exception, since there is an instance already running
+                                       log.error("Attaching Volume to Instance 
[ " + instanceId + " ] failed!", e);
+                               }
                        }
 
             log.info("Instance is successfully starting up. 
"+memberContext.toString());

Reply via email to