Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 89B82D86B for ; Tue, 21 Aug 2012 08:17:33 +0000 (UTC) Received: (qmail 87525 invoked by uid 500); 21 Aug 2012 08:17:33 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 87250 invoked by uid 500); 21 Aug 2012 08:17:26 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 87217 invoked by uid 99); 21 Aug 2012 08:17:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2012 08:17:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A37291E9F0; Tue, 21 Aug 2012 08:17:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitin@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. Message-Id: <20120821081724.A37291E9F0@tyr.zones.apache.org> Date: Tue, 21 Aug 2012 08:17:24 +0000 (UTC) Updated Branches: refs/heads/master 20ccb6c1c -> 7aa7d6e39 CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. Reviewed-by: Kishan Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7aa7d6e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7aa7d6e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7aa7d6e3 Branch: refs/heads/master Commit: 7aa7d6e39fdfbc36cd614d5ad887b7c1051ad71f Parents: 20ccb6c Author: Nitin Mehta Authored: Tue Aug 21 13:39:05 2012 +0530 Committer: Nitin Mehta Committed: Tue Aug 21 13:46:18 2012 +0530 ---------------------------------------------------------------------- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7aa7d6e3/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 2f0c640..8ae8ddc 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -842,7 +842,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma @Override public HostVO getSecondaryStorageHost(SnapshotVO snapshot) { HostVO secHost = null; - if( snapshot.getSwiftId() == null ) { + if( snapshot.getSwiftId() == null || snapshot.getSwiftId() == 0) { secHost = _hostDao.findById(snapshot.getSecHostId()); } else { Long dcId = snapshot.getDataCenterId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7aa7d6e3/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index b7c1c0e..051791f 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1523,7 +1523,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager } } } - if( snapshot.getSwiftId() != null ) { + if( snapshot.getSwiftId() != null && snapshot.getSwiftId() != 0 ) { _snapshotMgr.downloadSnapshotsFromSwift(snapshot); } cmd = new CreatePrivateTemplateFromSnapshotCommand(pool.getUuid(), secondaryStorageURL, dcId, accountId, snapshot.getVolumeId(), backupSnapshotUUID, snapshot.getName(),