You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/28 11:18:02 UTC
[1/3] git commit: updated refs/heads/master to dbe57c3
Repository: cloudstack
Updated Branches:
refs/heads/master edf4fe951 -> dbe57c3e5
CLOUDSTACK-9538: FIX failure in Deleting Snapshot From Primary Storage RBD Storage if vm has been removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/784c3358
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/784c3358
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/784c3358
Branch: refs/heads/master
Commit: 784c33585fbce93b363543c362d7b821e5896be8
Parents: 2ebf949
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Oct 13 11:54:43 2016 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Mon Oct 17 08:25:34 2016 +0200
----------------------------------------------------------------------
.../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/784c3358/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
index 2544484..5771d9f 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
@@ -268,7 +268,9 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase {
SnapshotDataStoreVO snapshotOnPrimary = snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Primary);
if (snapshotOnPrimary != null) {
SnapshotInfo snapshotOnPrimaryInfo = snapshotDataFactory.getSnapshot(snapshotId, DataStoreRole.Primary);
- if (((PrimaryDataStoreImpl)snapshotOnPrimaryInfo.getDataStore()).getPoolType() == StoragePoolType.RBD) {
+ long volumeId = snapshotOnPrimary.getVolumeId();
+ VolumeVO volumeVO = volumeDao.findById(volumeId);
+ if (((PrimaryDataStoreImpl)snapshotOnPrimaryInfo.getDataStore()).getPoolType() == StoragePoolType.RBD && volumeVO != null) {
snapshotSvr.deleteSnapshot(snapshotOnPrimaryInfo);
}
snapshotOnPrimary.setState(State.Destroyed);
[3/3] git commit: updated refs/heads/master to dbe57c3
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dbe57c3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dbe57c3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dbe57c3e
Branch: refs/heads/master
Commit: dbe57c3e501ac6f2db76a45604abe0442657891f
Parents: edf4fe9 a5d5784
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Nov 28 16:47:44 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 28 16:47:44 2016 +0530
----------------------------------------------------------------------
.../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbe57c3e/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to dbe57c3
Posted by bh...@apache.org.
Merge pull request #1710 from ustcweizhou/CLOUDSTACK-9538-deletesnapshot
CLOUDSTACK-9538: FIX failure in Deleting Snapshot From Primary Storage RBD Storage if vm has been removed
* pr/1710:
CLOUDSTACK-9538: FIX failure in Deleting Snapshot From Primary Storage RBD Storage if vm has been removed
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5d57848
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5d57848
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5d57848
Branch: refs/heads/master
Commit: a5d5784859029f5abae6ceff2dbd370f50e79ae2
Parents: fd6833b 784c335
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Nov 28 16:47:12 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 28 16:47:19 2016 +0530
----------------------------------------------------------------------
.../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------