apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2578: NPE in deleting template from S3.

Browse Source
This commit is contained in:
Min Chen 2013-05-21 14:43:32 -07:00
parent cb0659ab33
commit a4e6784e0b
4 changed files with 11 additions and 10 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

@ -276,8 +276,9 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
// TODO: need to understand why we need to mark destroyed in // TODO: need to understand why we need to mark destroyed in
// template_store_ref table here instead of in callback. // template_store_ref table here instead of in callback.
// Currently I did that in callback, so I removed previous code to mark template_host_ref // Currently I did that in callback, so I removed previous code to mark template_host_ref
if ( sZoneId != null ){
UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null); UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null);
}
// get installpath of this template on image store // get installpath of this template on image store
TemplateDataStoreVO tmplStore = _templateStoreDao.findByStoreTemplate(storeId, templateId); TemplateDataStoreVO tmplStore = _templateStoreDao.findByStoreTemplate(storeId, templateId);

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

@ -286,11 +286,10 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
eventType = EventTypes.EVENT_TEMPLATE_DELETE; eventType = EventTypes.EVENT_TEMPLATE_DELETE;
} }
// TODO: need to understand why we need to mark destroyed in if ( sZoneId != null ){
// template_store_ref table here instead of in callback. //TODO: how to handle region wide usage data where sZoneId == null
// Currently I did that in callback, so I removed previous code to mark template_host_ref UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null);
}
UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null);
List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId); List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId);
// check if there is any VM using this ISO. // check if there is any VM using this ISO.

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

@ -281,8 +281,9 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
// TODO: need to understand why we need to mark destroyed in // TODO: need to understand why we need to mark destroyed in
// template_store_ref table here instead of in callback. // template_store_ref table here instead of in callback.
// Currently I did that in callback, so I removed previous code to mark template_host_ref // Currently I did that in callback, so I removed previous code to mark template_host_ref
if (sZoneId != null){
UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null); UsageEventUtils.publishUsageEvent(eventType, account.getId(), sZoneId, templateId, null, null, null);
}
List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId); List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId);
// check if there is any VM using this ISO. // check if there is any VM using this ISO.

2
services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -1535,7 +1535,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
final String bucket = s3.getBucketName(); final String bucket = s3.getBucketName();
try { try {
S3Utils.deleteDirectory(s3, bucket, path); S3Utils.deleteDirectory(s3, bucket, path);
return new Answer(cmd, true, String.format("Deleted template %1%s from bucket %2$s.", path, bucket)); return new Answer(cmd, true, String.format("Deleted template %1$s from bucket %2$s.", path, bucket));
} catch (Exception e) { } catch (Exception e) {
final String errorMessage = String.format("Failed to delete template %1$s from bucket %2$s due to the following error: %3$s", path, final String errorMessage = String.format("Failed to delete template %1$s from bucket %2$s due to the following error: %3$s", path,
bucket, e.getMessage()); bucket, e.getMessage());