apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in updating template_store_ref entry.

Browse Source
This commit is contained in:
Min Chen 2013-05-07 16:45:37 -07:00
parent e8c69632b6
commit 70f866156f
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
View File

@ -175,6 +175,8 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data;
DataStore store = obj.getDataStore();
TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
if (tmpltStoreVO != null) {
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setDownloadState(answer.getDownloadStatus());
@ -185,7 +187,8 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
updateBuilder.setInstallPath(answer.getInstallPath());
updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(store.getId(), updateBuilder);
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();

5
plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java
View File

@ -225,6 +225,8 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data;
DataStore store = obj.getDataStore();
TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
if (tmpltStoreVO != null) {
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setDownloadState(answer.getDownloadStatus());
@ -235,7 +237,8 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
updateBuilder.setInstallPath(answer.getInstallPath());
updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(store.getId(), updateBuilder);
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();

5
plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
View File

@ -178,6 +178,8 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data;
DataStore store = obj.getDataStore();
TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
if (tmpltStoreVO != null) {
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setDownloadState(answer.getDownloadStatus());
@ -188,7 +190,8 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
updateBuilder.setInstallPath(answer.getInstallPath());
updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(store.getId(), updateBuilder);
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();