CLOUDSTACK-5530 attempt to add secondary storage with the same name is ignored

bvbharat · minchen07 · commit 69fb1d4ed041 · 2013-12-26T11:48:45.000-08:00
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1689,6 +1689,15 @@ public ImageStore discoverImageStore(AddImageStoreCmd cmd) throws IllegalArgumen
             scopeType = ScopeType.REGION;
         }
 
+        String name = cmd.getName();
+        if (name == null) {
+            name = cmd.getUrl();
+        }
+        ImageStoreVO imageStore = _imageStoreDao.findByName(name);
+        if (imageStore != null) {
+            throw new InvalidParameterValueException("The image store with name " + name + " already exists, try creating with another name");
+        }
+
         // check if scope is supported by store provider
         if (!((ImageStoreProvider) storeProvider).isScopeSupported(scopeType)) {
             throw new InvalidParameterValueException("Image store provider " + providerName + " does not support scope " + scopeType);
