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 78B58DF52 for ; Thu, 9 Aug 2012 01:41:11 +0000 (UTC) Received: (qmail 50837 invoked by uid 500); 9 Aug 2012 01:41:09 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 50762 invoked by uid 500); 9 Aug 2012 01:41:09 -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 50351 invoked by uid 99); 9 Aug 2012 01:41:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 01:41:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4EF623CA83; Thu, 9 Aug 2012 01:41:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [10/23] git commit: agent: Exit when local.storage.uuid is not set Message-Id: <20120809014108.4EF623CA83@tyr.zones.apache.org> Date: Thu, 9 Aug 2012 01:41:08 +0000 (UTC) agent: Exit when local.storage.uuid is not set We used to generate a UUID when this wasn't set, but since we aren't writing to agent.properties anymore we have to make sure the UUID is persistent across restarts. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a12a0081 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a12a0081 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a12a0081 Branch: refs/heads/vpc Commit: a12a0081e939f6c3eddd87aafb6fc3096ef70acd Parents: 57a1426 Author: Wido den Hollander Authored: Wed Aug 8 22:26:37 2012 +0200 Committer: Wido den Hollander Committed: Wed Aug 8 22:31:06 2012 +0200 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a12a0081/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 5e38d82..b5f0103 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -617,8 +617,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements _localStorageUUID = (String) params.get("local.storage.uuid"); if (_localStorageUUID == null) { - _localStorageUUID = UUID.randomUUID().toString(); - params.put("local.storage.uuid", _localStorageUUID); + throws new ConfigurationException("local.storage.uuid is not set! Please set this to a valid UUID"); } value = (String) params.get("scripts.timeout");