bug 9909: upload manager support multiple secondary storage

Abhinandan Prateek · Abhinandan Prateek · commit d006fd141ce5 · 2011-05-30T12:39:15.000+05:30
diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -539,8 +539,8 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             _params.put(StorageLayer.InstanceConfigKey, _storage);
             _dlMgr = new DownloadManagerImpl();
             _dlMgr.configure("DownloadManager", _params);
-            //_upldMgr = new UploadManagerImpl();
-            //_upldMgr.configure("UploadManager", params);
+            _upldMgr = new UploadManagerImpl();
+            _upldMgr.configure("UploadManager", params);
         } catch (ConfigurationException e) {
             s_logger.warn("Caught problem while configuring DownloadManager", e);
             return false;
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -200,11 +200,20 @@ public UploadVO createEntityDownloadURL(VMTemplateVO template, VMTemplateHostVO
 	    
 	    Type type = (template.getFormat() == ImageFormat.ISO) ? Type.ISO : Type.TEMPLATE ;
 	    
-	    //Check if ssvm is up
-	    HostVO sserver = storageServers.get(0);
-	    if(sserver.getStatus() != com.cloud.host.Status.Up){
-	    	throw new CloudRuntimeException("Couldnt create extract link - Secondary Storage Vm is not up");
-	    }
+	    List<HostVO> storageServerVMs = _serverDao.listByTypeDataCenter(Host.Type.SecondaryStorageVM, dataCenterId);
+        //Check if one ssvm is up
+        boolean no_vm_up = true;
+        HostVO use_ssvm = null;
+        for (HostVO ssvm: storageServerVMs){
+            if(ssvm.getStatus() == com.cloud.host.Status.Up){
+                no_vm_up = false;
+                use_ssvm = ssvm;
+                break;
+            }  
+        }
+        if(no_vm_up){
+            throw new CloudRuntimeException("Couldnt create extract link - Secondary Storage Vm is not up");
+        }
 	    
 	    //Check if it already exists.
 	    List<UploadVO> extractURLList = _uploadDao.listByTypeUploadStatus(template.getId(), type, UploadVO.Status.DOWNLOAD_URL_CREATED);	    
@@ -213,15 +222,15 @@ public UploadVO createEntityDownloadURL(VMTemplateVO template, VMTemplateHostVO
         }
 	    
 	    // It doesn't exist so create a DB entry.	    
-	    UploadVO uploadTemplateObj = new UploadVO(sserver.getId(), template.getId(), new Date(), 
+	    UploadVO uploadTemplateObj = new UploadVO(use_ssvm.getId(), template.getId(), new Date(), 
 	                                                Status.DOWNLOAD_URL_NOT_CREATED, 0, type, Mode.HTTP_DOWNLOAD); 
 	    uploadTemplateObj.setInstallPath(vmTemplateHost.getInstallPath());	                                                
 	    _uploadDao.persist(uploadTemplateObj);
 	    try{
     	    // Create Symlink at ssvm
 	    	String uuid = UUID.randomUUID().toString() + ".vhd";
     	    CreateEntityDownloadURLCommand cmd = new CreateEntityDownloadURLCommand(vmTemplateHost.getInstallPath(), uuid);
-    	    long result = send(sserver.getId(), cmd, null);
+    	    long result = send(use_ssvm.getId(), cmd, null);
     	    if (result == -1){
     	        errorString = "Unable to create a link for " +type+ " id:"+template.getId();
                 s_logger.error(errorString);
@@ -230,7 +239,7 @@ public UploadVO createEntityDownloadURL(VMTemplateVO template, VMTemplateHostVO
     	    
     	    //Construct actual URL locally now that the symlink exists at SSVM
     	    List<SecondaryStorageVmVO> ssVms = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running);
-            if (ssVms.size() > 0) {
+    	    if (ssVms.size() > 0) {
                 SecondaryStorageVmVO ssVm = ssVms.get(0);
                 if (ssVm.getPublicIpAddress() == null) {
                     errorString = "A running secondary storage vm has a null public ip?";
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -262,12 +262,20 @@ private Long extract(Account account, Long templateId, String url, Long zoneId,
         	}
         }
 
-        HostVO secondaryStorageHost = _storageMgr.getSecondaryStorageHost(zoneId);
+        List<HostVO> sservers = _storageMgr.getSecondaryStorageHosts(zoneId);
+
         VMTemplateHostVO tmpltHostRef = null;
-        if (secondaryStorageHost != null) {
-            tmpltHostRef = _tmpltHostDao.findByHostTemplate(secondaryStorageHost.getId(), templateId);
-            if (tmpltHostRef != null && tmpltHostRef.getDownloadState() != com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
-                throw new InvalidParameterValueException("The " + desc + " has not been downloaded ");
+        if (sservers != null) {
+            for(HostVO secondaryStorageHost: sservers){
+                tmpltHostRef = _tmpltHostDao.findByHostTemplate(secondaryStorageHost.getId(), templateId);
+                if (tmpltHostRef != null){
+                    if (tmpltHostRef.getDownloadState() != com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
+                        throw new InvalidParameterValueException("The " + desc + " has not been downloaded ");
+                    }
+                    else {
+                        break;
+                    }
+                }
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -262,12 +262,20 @@ private Long extract(Account account, Long templateId, String url, Long zoneId,`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`		`- HostVO secondaryStorageHost = _storageMgr.getSecondaryStorageHost(zoneId);`
	`265`	`+ List<HostVO> sservers = _storageMgr.getSecondaryStorageHosts(zoneId);`
	`266`	`+`
`266`	`267`	`VMTemplateHostVO tmpltHostRef = null;`
`267`		`- if (secondaryStorageHost != null) {`
`268`		`- tmpltHostRef = _tmpltHostDao.findByHostTemplate(secondaryStorageHost.getId(), templateId);`
`269`		`- if (tmpltHostRef != null && tmpltHostRef.getDownloadState() != com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {`
`270`		`- throw new InvalidParameterValueException("The " + desc + " has not been downloaded ");`
	`268`	`+ if (sservers != null) {`
	`269`	`+ for(HostVO secondaryStorageHost: sservers){`
	`270`	`+ tmpltHostRef = _tmpltHostDao.findByHostTemplate(secondaryStorageHost.getId(), templateId);`
	`271`	`+ if (tmpltHostRef != null){`
	`272`	`+ if (tmpltHostRef.getDownloadState() != com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {`
	`273`	`+ throw new InvalidParameterValueException("The " + desc + " has not been downloaded ");`
	`274`	`+ }`
	`275`	`+ else {`
	`276`	`+ break;`
	`277`	`+ }`
	`278`	`+ }`
`271`	`279`	`}`
`272`	`280`	`}`
`273`	`281`