CLOUDSTACK-8101: volume sync not working as expected - MS restart during upload volume leaves volume in hung state.

minchen07 · yadvr · commit ff70ef797caa · 2015-01-20T11:43:36.000+05:30
(cherry picked from commit e559b15) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1383,7 +1383,8 @@ public void handleVolumeSync(DataStore store) {
                         return;
                     }
 
-                    List<VolumeDataStoreVO> dbVolumes = _volumeStoreDao.listUploadedVolumesByStoreId(storeId);
+                    // find all the db volumes including those with NULL url column to avoid accidentally deleting volumes on image store later.
+                    List<VolumeDataStoreVO> dbVolumes = _volumeStoreDao.listByStoreId(storeId);
                     List<VolumeDataStoreVO> toBeDownloaded = new ArrayList<VolumeDataStoreVO>(dbVolumes);
                     for (VolumeDataStoreVO volumeStore : dbVolumes) {
                         VolumeVO volume = volDao.findById(volumeStore.getVolumeId());

Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,8 @@ public void handleVolumeSync(DataStore store) {`
`1383`	`1383`	`return;`
`1384`	`1384`	`}`
`1385`	`1385`
`1386`		`- List<VolumeDataStoreVO> dbVolumes = _volumeStoreDao.listUploadedVolumesByStoreId(storeId);`
	`1386`	`+ // find all the db volumes including those with NULL url column to avoid accidentally deleting volumes on image store later.`
	`1387`	`+ List<VolumeDataStoreVO> dbVolumes = _volumeStoreDao.listByStoreId(storeId);`
`1387`	`1388`	`List<VolumeDataStoreVO> toBeDownloaded = new ArrayList<VolumeDataStoreVO>(dbVolumes);`
`1388`	`1389`	`for (VolumeDataStoreVO volumeStore : dbVolumes) {`
`1389`	`1390`	`VolumeVO volume = volDao.findById(volumeStore.getVolumeId());`