etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9586: When using shared storage with Xenserver prepareTemplate does not work when there are more than 1 hosts

This commit is contained in:
Abhinandan Prateek 2016-11-10 11:55:57 +05:30
parent 7385441807
commit 6bcefb4bea
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
View File

@ -87,24 +87,25 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
SR sr = null;
PBD pbd = null;
try {
String srname = hypervisorResource.getHost().uuid + path.trim();
Set<SR> srs = SR.getByNameLabel(conn, srname);
if ( srs != null && !srs.isEmpty()) {
final String srname = path.trim();
synchronized (srname.intern()) {
Set<SR> srs = SR.getByNameLabel(conn, srname);
if ( srs != null && !srs.isEmpty()) {
return srs.iterator().next();
}
Map<String, String> smConfig = new HashMap<String, String>();
Host host = Host.getByUuid(conn, hypervisorResource.getHost().uuid);
String uuid = UUID.randomUUID().toString();
sr = SR.introduce(conn, uuid, srname, srname, "file", "file", false, smConfig);
PBD.Record record = new PBD.Record();
record.host = host;
record.SR = sr;
smConfig.put("location", path);
record.deviceConfig = smConfig;
pbd = PBD.create(conn, record);
pbd.plug(conn);
sr.scan(conn);
}
Map<String, String> smConfig = new HashMap<String, String>();
Host host = Host.getByUuid(conn, hypervisorResource.getHost().uuid);
String uuid = UUID.randomUUID().toString();
sr = SR.introduce(conn, uuid, srname, srname, "file", "file", false, smConfig);
PBD.Record record = new PBD.Record();
record.host = host;
record.SR = sr;
smConfig.put("location", path);
record.deviceConfig = smConfig;
pbd = PBD.create(conn, record);
pbd.plug(conn);
sr.scan(conn);
return sr;
} catch (Exception e) {
try {