cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to ba75029
Date Mon, 29 Jun 2015 16:38:12 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 e50547a3e -> ba750293c


XenserverSnapshotStrategy: check if primary is null before proceeding in backupSnapshot

In backupSnapshot, it checks for snapshot in primary but does not check in advance if
it is null.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba750293
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba750293
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba750293

Branch: refs/heads/4.5
Commit: ba750293cc8a4e32c65e7dbb6dab138556ce5736
Parents: e50547a
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Jun 29 18:34:19 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Jun 29 18:38:04 2015 +0200

----------------------------------------------------------------------
 .../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba750293/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 51f75bd..aefb128 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
@@ -111,8 +111,9 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase {
 
         boolean fullBackup = true;
         SnapshotDataStoreVO parentSnapshotOnBackupStore = snapshotStoreDao.findLatestSnapshotForVolume(snapshot.getVolumeId(),
DataStoreRole.Image);
+        SnapshotDataStoreVO parentSnapshotOnPrimaryStore = snapshotStoreDao.findLatestSnapshotForVolume(snapshot.getVolumeId(),
DataStoreRole.Primary);
         HypervisorType hypervisorType = snapshot.getBaseVolume().getHypervisorType();
-        if (parentSnapshotOnBackupStore != null && hypervisorType == Hypervisor.HypervisorType.XenServer)
{ // CS does incremental backup only for XenServer
+        if (parentSnapshotOnBackupStore != null && parentSnapshotOnPrimaryStore !=
null && hypervisorType == Hypervisor.HypervisorType.XenServer) { // CS does incremental
backup only for XenServer
 
             // In case of volume migration from one pool to other pool, CS should take full
snapshot to avoid any issues with delta chain,
             // to check if this is a migrated volume, compare the current pool id of volume
and store_id of oldest snapshot on primary for this volume.


Mime
View raw message