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 EFB3A173EC for ; Wed, 7 Jan 2015 10:17:26 +0000 (UTC) Received: (qmail 43882 invoked by uid 500); 7 Jan 2015 10:17:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 43843 invoked by uid 500); 7 Jan 2015 10:17:23 -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 43534 invoked by uid 99); 7 Jan 2015 10:17:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 10:17:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 17A3AA26119; Wed, 7 Jan 2015 10:17:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Wed, 07 Jan 2015 10:17:35 -0000 Message-Id: <36b49d760d8f4ac6a81a6f11dcfff9e1@git.apache.org> In-Reply-To: <647f9f3afed54feba9c2be5569467535@git.apache.org> References: <647f9f3afed54feba9c2be5569467535@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] git commit: updated refs/heads/vmware-disk-controllers to 85bd96c While deploying Vm with DataDisk in LXC, if the rbd image mapping on the host fails, deploy Vm should fail Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85bd96c6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85bd96c6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85bd96c6 Branch: refs/heads/vmware-disk-controllers Commit: 85bd96c6b28922702dca8014edf9b922a7462eee Parents: f767adf Author: Kishan Kavala Authored: Mon Nov 24 16:03:23 2014 +0530 Committer: Kishan Kavala Committed: Wed Jan 7 15:09:57 2015 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85bd96c6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index c80ccc3..9ae7a17 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -4030,6 +4030,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv diskdef.defBlockBasedDisk(device, devId, DiskDef.diskBus.VIRTIO); diskdef.setQemuDriver(false); vm.getDevices().addDevice(diskdef); + } else { + throw new InternalErrorException("Error while mapping RBD device on host"); } } }