From 9ce2dde030bd88ece8408571d9bb80e6ca4508cd Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Wed, 15 Mar 2017 15:59:06 +0530 Subject: [PATCH] CLOUDSTACK-9834: prepareTemplate API call doesn't work well with XenServer & Local SR (Db_exn.Uniqueness_constraint_violation) removed the host uuid from SR label so that any host which has access to the SR(all the hosts in the same pool) can reuse the same SR (cherry picked from commit 1aa6a72bc7deda32c8cd07e468841e3fc15bf6f8) Signed-off-by: Rohit Yadav --- .../xenserver/resource/Xenserver625StorageProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java index b70057dda9c..05dd56612d0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java @@ -100,7 +100,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { PBD pbd = null; try { - final String srname = hypervisorResource.getHost().getUuid() + path.trim(); + final String srname = path.trim(); synchronized (srname.intern()) { final Set srs = SR.getByNameLabel(conn, srname); if (srs != null && !srs.isEmpty()) {