cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [3/3] git commit: updated refs/heads/master to f87eed5
Date Tue, 13 Aug 2013 22:17:14 GMT
fix compile


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f87eed5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f87eed5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f87eed5b

Branch: refs/heads/master
Commit: f87eed5b79d0102c900af2543896d844c6eb9c35
Parents: 3eb34d0
Author: Edison Su <sudison@gmail.com>
Authored: Tue Aug 13 15:16:23 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Aug 13 15:16:46 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeApiServiceImpl.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f87eed5b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index b2104ad..d50a1d0 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1139,6 +1139,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             } catch (ConcurrentOperationException e) {
                 s_logger.debug("move volume failed", e);
                 throw new CloudRuntimeException("move volume failed", e);
+            } catch (StorageUnavailableException e) {
+                s_logger.debug("move volume failed", e);
+                throw new CloudRuntimeException("move volume failed", e);
             }
         }
 
@@ -1344,7 +1347,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         if (liveMigrateVolume) {
             newVol = liveMigrateVolume(vol, destPool);
         } else {
-            newVol = _volumeMgr.migrateVolume(vol, destPool);
+            try {
+                newVol = _volumeMgr.migrateVolume(vol, destPool);
+            } catch (StorageUnavailableException e) {
+               s_logger.debug("Failed to migrate volume", e);
+            }
         }
         return newVol;
     }


Mime
View raw message