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 2F30B17BF7 for ; Tue, 3 Feb 2015 17:09:30 +0000 (UTC) Received: (qmail 52602 invoked by uid 500); 3 Feb 2015 17:08:56 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 52575 invoked by uid 500); 3 Feb 2015 17:08:56 -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 52566 invoked by uid 99); 3 Feb 2015 17:08:56 -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, 03 Feb 2015 17:08:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EF60E03F2; Tue, 3 Feb 2015 17:08:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to ce56315 Date: Tue, 3 Feb 2015 17:08:56 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.3 a10a9d522 -> ce5631553 CLOUDSTACK-8198: Use random local storage UUID Earlier host addition of multiple hosts with local storage failed due to same local storage UUID being used where the storage path is same. Signed-off-by: Rohit Yadav (cherry picked from commit bf17f640c679bab1bd740d4eb068deb1bc2eb3af) Signed-off-by: Rohit Yadav Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce563155 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce563155 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce563155 Branch: refs/heads/4.3 Commit: ce5631553e61346a4752da48bc84615b2a443541 Parents: a10a9d5 Author: Rohit Yadav Authored: Tue Feb 3 22:26:20 2015 +0530 Committer: Rohit Yadav Committed: Tue Feb 3 22:38:39 2015 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce563155/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 486b9e1..0d44109 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 @@ -738,7 +738,7 @@ ServerResource { _localStorageUUID = (String) params.get("local.storage.uuid"); if (_localStorageUUID == null) { - _localStorageUUID = UUID.nameUUIDFromBytes(_localStoragePath.getBytes()).toString(); + _localStorageUUID = UUID.randomUUID().toString(); } value = (String) params.get("scripts.timeout");