From 1b14fa79532601d4cd7335c622112ca59cf70b35 Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Thu, 1 Aug 2013 19:53:13 +0530 Subject: [PATCH] CLOUDSTACK-3979: Update fullBackup flag correctly based on snapshot delta max config --- .../storage/snapshot/XenserverSnapshotStrategy.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 3e6c508a2ea..10f3a4c5fdd 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 @@ -102,14 +102,10 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase { SnapshotManager.DELTAMAX); int deltaSnap = _deltaSnapshotMax; + SnapshotDataStoreVO parentSnapshotOnBackupStore = this.snapshotStoreDao.findBySnapshot(parentSnapshot.getId(), + DataStoreRole.Image); int i; - SnapshotDataStoreVO parentSnapshotOnBackupStore = null; - for (i = 1; i < deltaSnap; i++) { - parentSnapshotOnBackupStore = this.snapshotStoreDao.findBySnapshot(parentSnapshot.getId(), - DataStoreRole.Image); - if (parentSnapshotOnBackupStore == null) { - break; - } + for (i = 1; (i < deltaSnap && (parentSnapshotOnBackupStore != null)); i++) { Long prevBackupId = parentSnapshotOnBackupStore.getParentSnapshotId(); if (prevBackupId == 0) {