Github user koushik-das commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1722#discussion_r91251778
  
    --- Diff: 
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
 ---
    @@ -260,11 +260,15 @@ public boolean deleteSnapshot(Long snapshotId) {
                 boolean result = deleteSnapshotChain(snapshotOnImage);
                 obj.processEvent(Snapshot.Event.OperationSucceeded);
                 if (result) {
    -                //snapshot is deleted on backup storage, need to delete it 
on primary storage
    -                SnapshotDataStoreVO snapshotOnPrimary = 
snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Primary);
    -                if (snapshotOnPrimary != null) {
    -                    snapshotOnPrimary.setState(State.Destroyed);
    -                    snapshotStoreDao.update(snapshotOnPrimary.getId(), 
snapshotOnPrimary);
    +                SnapshotInfo snapshotOnPrimary = 
snapshotDataFactory.getSnapshot(snapshotId, DataStoreRole.Primary);
    --- End diff --
    
    Master branch has slightly different code which deals with cleanup for RBD 
type storage pool. So if this is fwd merged there will be conflicts.


---
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.
---

Reply via email to