cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.3 to ce56315
Date Tue, 03 Feb 2015 17:08:56 GMT
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 <rohit.yadav@shapeblue.com>
(cherry picked from commit bf17f640c679bab1bd740d4eb068deb1bc2eb3af)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

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 <rohit.yadav@shapeblue.com>
Authored: Tue Feb 3 22:26:20 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
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");


Mime
View raw message