Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26E4317C0F for ; Tue, 17 Feb 2015 08:43:44 +0000 (UTC) Received: (qmail 2902 invoked by uid 500); 17 Feb 2015 08:43:34 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2851 invoked by uid 500); 17 Feb 2015 08:43:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 2710 invoked by uid 99); 17 Feb 2015 08:43:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Feb 2015 08:43:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6148E07F6; Tue, 17 Feb 2015 08:43:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Tue, 17 Feb 2015 08:43:37 -0000 Message-Id: <5dc8d98d83ef4fa5af95ec32df2dc226@git.apache.org> In-Reply-To: <9d95b5062a1340e7a8f16d25189ec4e1@git.apache.org> References: <9d95b5062a1340e7a8f16d25189ec4e1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: updated refs/heads/volume-upload to 075c841 volume upload: Use volume/template UUID instead of ID in UploadStatusCommand Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d19ea522 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d19ea522 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d19ea522 Branch: refs/heads/volume-upload Commit: d19ea5226a995435848cb8f64ae41af34e8a9655 Parents: 58f2fb1 Author: Koushik Das Authored: Wed Feb 4 18:35:12 2015 +0530 Committer: Rajani Karuturi Committed: Tue Feb 17 12:31:40 2015 +0530 ---------------------------------------------------------------------- .../cloudstack/storage/command/UploadStatusCommand.java | 10 +++++----- .../com/cloud/storage/ImageStoreUploadMonitorImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d19ea522/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java ---------------------------------------------------------------------- diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java index bad821e..9e6b76e 100644 --- a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java @@ -26,19 +26,19 @@ public class UploadStatusCommand extends Command { Volume, Template } - private long entityId; + private String entityUuid; private EntityType entityType; protected UploadStatusCommand() { } - public UploadStatusCommand(long entityId, EntityType entityType) { - this.entityId = entityId; + public UploadStatusCommand(String entityUuid, EntityType entityType) { + this.entityUuid = entityUuid; this.entityType = entityType; } - public long getEntityId() { - return entityId; + public String getEntityUuid() { + return entityUuid; } public EntityType getEntityType() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d19ea522/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java index 6a27f29..d87fe60 100755 --- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java +++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java @@ -190,7 +190,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto continue; } Host host = _hostDao.findById(ep.getId()); - UploadStatusCommand cmd = new UploadStatusCommand(volume.getId(), EntityType.Volume); + UploadStatusCommand cmd = new UploadStatusCommand(volume.getUuid(), EntityType.Volume); if (host != null && host.getManagementServerId() != null) { if (_nodeId == host.getManagementServerId().longValue()) { Answer answer = null; @@ -227,7 +227,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto continue; } Host host = _hostDao.findById(ep.getId()); - UploadStatusCommand cmd = new UploadStatusCommand(template.getId(), EntityType.Template); + UploadStatusCommand cmd = new UploadStatusCommand(template.getUuid(), EntityType.Template); if (host != null && host.getManagementServerId() != null) { if (_nodeId == host.getManagementServerId().longValue()) { Answer answer = null;