apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +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

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

@ -175,17 +175,20 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data; DataObject obj = context.data;
DataStore store = obj.getDataStore(); DataStore store = obj.getDataStore();
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate(); TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
updateBuilder.setDownloadPercent(answer.getDownloadPct()); if (tmpltStoreVO != null) {
updateBuilder.setDownloadState(answer.getDownloadStatus()); TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setLastUpdated(new Date()); updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setErrorString(answer.getErrorString()); updateBuilder.setDownloadState(answer.getDownloadStatus());
updateBuilder.setJobId(answer.getJobId()); updateBuilder.setLastUpdated(new Date());
updateBuilder.setLocalDownloadPath(answer.getDownloadPath()); updateBuilder.setErrorString(answer.getErrorString());
updateBuilder.setInstallPath(answer.getInstallPath()); updateBuilder.setJobId(answer.getJobId());
updateBuilder.setSize(answer.getTemplateSize()); updateBuilder.setLocalDownloadPath(answer.getDownloadPath());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize()); updateBuilder.setInstallPath(answer.getInstallPath());
_templateStoreDao.update(store.getId(), updateBuilder); updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback(); AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();

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

@ -225,17 +225,20 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data; DataObject obj = context.data;
DataStore store = obj.getDataStore(); DataStore store = obj.getDataStore();
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate(); TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
updateBuilder.setDownloadPercent(answer.getDownloadPct()); if (tmpltStoreVO != null) {
updateBuilder.setDownloadState(answer.getDownloadStatus()); TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setLastUpdated(new Date()); updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setErrorString(answer.getErrorString()); updateBuilder.setDownloadState(answer.getDownloadStatus());
updateBuilder.setJobId(answer.getJobId()); updateBuilder.setLastUpdated(new Date());
updateBuilder.setLocalDownloadPath(answer.getDownloadPath()); updateBuilder.setErrorString(answer.getErrorString());
updateBuilder.setInstallPath(answer.getInstallPath()); updateBuilder.setJobId(answer.getJobId());
updateBuilder.setSize(answer.getTemplateSize()); updateBuilder.setLocalDownloadPath(answer.getDownloadPath());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize()); updateBuilder.setInstallPath(answer.getInstallPath());
_templateStoreDao.update(store.getId(), updateBuilder); updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback(); AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();

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

@ -178,17 +178,20 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
DataObject obj = context.data; DataObject obj = context.data;
DataStore store = obj.getDataStore(); DataStore store = obj.getDataStore();
TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate(); TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(),obj.getId());
updateBuilder.setDownloadPercent(answer.getDownloadPct()); if (tmpltStoreVO != null) {
updateBuilder.setDownloadState(answer.getDownloadStatus()); TemplateDataStoreVO updateBuilder = _templateStoreDao.createForUpdate();
updateBuilder.setLastUpdated(new Date()); updateBuilder.setDownloadPercent(answer.getDownloadPct());
updateBuilder.setErrorString(answer.getErrorString()); updateBuilder.setDownloadState(answer.getDownloadStatus());
updateBuilder.setJobId(answer.getJobId()); updateBuilder.setLastUpdated(new Date());
updateBuilder.setLocalDownloadPath(answer.getDownloadPath()); updateBuilder.setErrorString(answer.getErrorString());
updateBuilder.setInstallPath(answer.getInstallPath()); updateBuilder.setJobId(answer.getJobId());
updateBuilder.setSize(answer.getTemplateSize()); updateBuilder.setLocalDownloadPath(answer.getDownloadPath());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize()); updateBuilder.setInstallPath(answer.getInstallPath());
_templateStoreDao.update(store.getId(), updateBuilder); updateBuilder.setSize(answer.getTemplateSize());
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
}
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback(); AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();