Github user DaanHoogland commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1403#discussion_r62890825
--- Diff:
plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
---
@@ -692,12 +1145,38 @@ private String deleteSnapshot(SnapshotInfo
snapshotInfo, long storagePoolId) {
_storagePoolDao.update(storagePoolId, storagePool);
}
catch (Exception ex) {
- s_logger.debug(SolidFireUtil.LOG_PREFIX + "Failed to delete
SolidFire volume. CloudStack snapshot ID: " + snapshotId, ex);
+ s_logger.debug(SolidFireUtil.LOG_PREFIX + "Issue in
'deleteSnapshot(SnapshotInfo, long)'. CloudStack snapshot ID: " + csSnapshotId,
ex);
- errMsg = ex.getMessage();
+ throw ex;
}
+ }
+
+ private void deleteTemplate(TemplateInfo template, long storagePoolId)
{
+ try {
+ SolidFireUtil.SolidFireConnection sfConnection =
SolidFireUtil.getSolidFireConnection(storagePoolId, _storagePoolDetailsDao);
+
+ long sfTemplateVolumeId =
getVolumeIdFrom_iScsiPath(template.getInstallPath());
- return errMsg;
+ SolidFireUtil.deleteSolidFireVolume(sfConnection,
sfTemplateVolumeId);
+
+ VMTemplateStoragePoolVO templatePoolRef =
_tmpltPoolDao.findByPoolTemplate(storagePoolId, template.getId());
+
+ _tmpltPoolDao.remove(templatePoolRef.getId());
+
+ StoragePoolVO storagePool =
_storagePoolDao.findById(storagePoolId);
+
+ // getUsedBytes(StoragePool) will not include the template to
delete because the "template_spool_ref" table has already been updated by this
point
+ long usedBytes = getUsedBytes(storagePool);
+
+ storagePool.setUsedBytes(usedBytes < 0 ? 0 : usedBytes);
+
+ _storagePoolDao.update(storagePoolId, storagePool);
+ }
+ catch (Exception ex) {
--- End diff --
???
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
