Skip to content

Commit 6c3f4b4

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.14' into 4.15
2 parents 4dcd9a2 + 6048afb commit 6c3f4b4

9 files changed

Lines changed: 57 additions & 25 deletions

File tree

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package com.cloud.hypervisor.xenserver.resource;
1818

19+
import com.cloud.storage.Storage;
1920
import com.xensource.xenapi.Host;
2021

2122
/**
@@ -44,4 +45,14 @@ public static String getPVbootloaderArgs(String guestOS) {
4445
}
4546
return "";
4647
}
48+
49+
public static String getSRNameLabel(final String poolUuid,
50+
final Storage.StoragePoolType poolType,
51+
final String poolPath) {
52+
if (Storage.StoragePoolType.PreSetup.equals(poolType) &&
53+
!poolPath.contains(poolUuid)) {
54+
return poolPath.replaceFirst("/", "");
55+
}
56+
return poolUuid;
57+
}
4758
}

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,9 @@ public Answer createVolume(final CreateObjectCommand cmd) {
798798

799799
try {
800800
final Connection conn = hypervisorResource.getConnection();
801-
final SR poolSr = hypervisorResource.getStorageRepository(conn, data.getDataStore().getUuid());
801+
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)data.getDataStore();
802+
final SR poolSr = hypervisorResource.getStorageRepository(conn,
803+
CitrixHelper.getSRNameLabel(primaryStore.getUuid(), primaryStore.getPoolType(), primaryStore.getPath()));
802804
VDI.Record vdir = new VDI.Record();
803805
vdir.nameLabel = volume.getName();
804806
vdir.SR = poolSr;
@@ -871,7 +873,9 @@ public Answer copyVolumeFromImageCacheToPrimary(final CopyCommand cmd) {
871873
if (srcStore instanceof NfsTO) {
872874
final NfsTO nfsStore = (NfsTO) srcStore;
873875
try {
874-
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, destVolume.getDataStore().getUuid());
876+
final PrimaryDataStoreTO destStore = (PrimaryDataStoreTO)destVolume.getDataStore();
877+
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn,
878+
CitrixHelper.getSRNameLabel(destStore.getUuid(), destStore.getPoolType(), destStore.getPath()));
875879
final String srUuid = primaryStoragePool.getUuid(conn);
876880
final URI uri = new URI(nfsStore.getUrl());
877881
final String volumePath = uri.getHost() + ":" + uri.getPath() + nfsStore.getPathSeparator() + srcVolume.getPath();
@@ -1153,7 +1157,9 @@ public Answer backupSnapshot(final CopyCommand cmd) {
11531157
final DataTO cacheData = cmd.getCacheTO();
11541158
final DataTO destData = cmd.getDestTO();
11551159
final int wait = cmd.getWait();
1156-
final String primaryStorageNameLabel = srcData.getDataStore().getUuid();
1160+
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)srcData.getDataStore();
1161+
final String primaryStorageNameLabel = CitrixHelper.getSRNameLabel(primaryStore.getUuid(),
1162+
primaryStore.getPoolType(), primaryStore.getPath());
11571163
String secondaryStorageUrl = null;
11581164
NfsTO cacheStore = null;
11591165
String destPath = null;

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public Answer copyTemplateToPrimaryStorage(final CopyCommand cmd) {
328328

329329
destSr = hypervisorResource.prepareManagedSr(conn, details);
330330
} else {
331-
final String srName = destStore.getUuid();
331+
final String srName = CitrixHelper.getSRNameLabel(destStore.getUuid(), destStore.getPoolType(), destStore.getPath());
332332
final Set<SR> srs = SR.getByNameLabel(conn, srName);
333333

334334
if (srs.size() != 1) {
@@ -494,7 +494,8 @@ public Answer backupSnapshot(final CopyCommand cmd) {
494494
final DataTO destData = cmd.getDestTO();
495495
final int wait = cmd.getWait();
496496
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)srcData.getDataStore();
497-
final String primaryStorageNameLabel = primaryStore.getUuid();
497+
final String primaryStorageNameLabel = CitrixHelper.getSRNameLabel(primaryStore.getUuid(),
498+
primaryStore.getPoolType(), primaryStore.getPath());
498499
String secondaryStorageUrl = null;
499500
NfsTO cacheStore = null;
500501
String destPath = null;
@@ -1001,7 +1002,8 @@ public Answer copyVolumeFromImageCacheToPrimary(final CopyCommand cmd) {
10011002
final SR srcSr = createFileSr(conn, uri.getHost() + ":" + uri.getPath(), volumeDirectory);
10021003
Task task = null;
10031004
try {
1004-
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, primaryStore.getUuid());
1005+
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn,
1006+
CitrixHelper.getSRNameLabel(primaryStore.getUuid(), primaryStore.getPoolType(), primaryStore.getPath()));
10051007
final VDI srcVdi = VDI.getByUuid(conn, volumeUuid);
10061008
task = srcVdi.copyAsync(conn, primaryStoragePool, null, null);
10071009
// poll every 1 seconds ,

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.cloud.agent.api.storage.MigrateVolumeCommand;
3030
import com.cloud.agent.api.to.DiskTO;
3131
import com.cloud.agent.api.to.StorageFilerTO;
32+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
3233
import com.cloud.hypervisor.xenserver.resource.XenServer610Resource;
3334
import com.cloud.resource.CommandWrapper;
3435
import com.cloud.resource.ResourceWrapper;
@@ -62,10 +63,8 @@ public Answer execute(final MigrateVolumeCommand command, final XenServer610Reso
6263
chapInitiatorUsername, chapInitiatorSecret, false);
6364
}
6465
else {
65-
StorageFilerTO destPoolTO = command.getPool();
66-
String destPoolUuid = destPoolTO.getUuid();
67-
68-
destPool = xenServer610Resource.getStorageRepository(connection, destPoolUuid);
66+
final StorageFilerTO pool = command.getPool();
67+
destPool = xenServer610Resource.getStorageRepository(connection, CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
6968
}
7069

7170
Map<String, String> other = new HashMap<>();

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Map;
2525
import java.util.Set;
2626

27-
import com.cloud.utils.Pair;
2827
import org.apache.cloudstack.storage.to.VolumeObjectTO;
2928
import org.apache.log4j.Logger;
3029

@@ -35,12 +34,14 @@
3534
import com.cloud.agent.api.to.StorageFilerTO;
3635
import com.cloud.agent.api.to.VirtualMachineTO;
3736
import com.cloud.agent.api.to.VolumeTO;
37+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
3838
import com.cloud.hypervisor.xenserver.resource.XenServer610Resource;
3939
import com.cloud.hypervisor.xenserver.resource.XsHost;
4040
import com.cloud.hypervisor.xenserver.resource.XsLocalNetwork;
4141
import com.cloud.network.Networks.TrafficType;
4242
import com.cloud.resource.CommandWrapper;
4343
import com.cloud.resource.ResourceWrapper;
44+
import com.cloud.utils.Pair;
4445
import com.cloud.utils.exception.CloudRuntimeException;
4546
import com.xensource.xenapi.Connection;
4647
import com.xensource.xenapi.Host;
@@ -88,7 +89,9 @@ public Answer execute(final MigrateWithStorageCommand command, final XenServer61
8889
for (final Pair<VolumeTO, StorageFilerTO> entry : volumeToFiler) {
8990
final StorageFilerTO storageFiler = entry.second();
9091
final VolumeTO volume = entry.first();
91-
vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, volume.getPath()), xenServer610Resource.getStorageRepository(connection, storageFiler.getUuid()));
92+
vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, volume.getPath()),
93+
xenServer610Resource.getStorageRepository(connection,
94+
CitrixHelper.getSRNameLabel(storageFiler.getUuid(), storageFiler.getType(), storageFiler.getPath())));
9295
}
9396

9497
// Get the vm to migrate.

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.cloud.agent.api.storage.CreateCommand;
2929
import com.cloud.agent.api.to.StorageFilerTO;
3030
import com.cloud.agent.api.to.VolumeTO;
31+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
3132
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
3233
import com.cloud.resource.CommandWrapper;
3334
import com.cloud.resource.ResourceWrapper;
@@ -50,7 +51,8 @@ public Answer execute(final CreateCommand command, final CitrixResourceBase citr
5051

5152
VDI vdi = null;
5253
try {
53-
final SR poolSr = citrixResourceBase.getStorageRepository(conn, pool.getUuid());
54+
final SR poolSr = citrixResourceBase.getStorageRepository(conn,
55+
CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
5456
if (command.getTemplateUrl() != null) {
5557
VDI tmpltvdi = null;
5658

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.cloud.agent.api.Answer;
2727
import com.cloud.agent.api.DeleteStoragePoolCommand;
2828
import com.cloud.agent.api.to.StorageFilerTO;
29+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
2930
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
3031
import com.cloud.resource.CommandWrapper;
3132
import com.cloud.resource.ResourceWrapper;
@@ -46,16 +47,16 @@ public Answer execute(final DeleteStoragePoolCommand command, final CitrixResour
4647

4748
// getRemoveDatastore being true indicates we are using managed storage and need to pull the SR name out of a Map
4849
// instead of pulling it out using getUuid of the StorageFilerTO instance.
50+
51+
String srNameLabel;
4952
if (command.getRemoveDatastore()) {
5053
Map<String, String> details = command.getDetails();
51-
52-
String srNameLabel = details.get(DeleteStoragePoolCommand.DATASTORE_NAME);
53-
54-
sr = citrixResourceBase.getStorageRepository(conn, srNameLabel);
54+
srNameLabel = details.get(DeleteStoragePoolCommand.DATASTORE_NAME);
5555
}
5656
else {
57-
sr = citrixResourceBase.getStorageRepository(conn, poolTO.getUuid());
57+
srNameLabel = CitrixHelper.getSRNameLabel(poolTO.getUuid(), poolTO.getType(), poolTO.getPath());
5858
}
59+
sr = citrixResourceBase.getStorageRepository(conn, srNameLabel);
5960

6061
citrixResourceBase.removeSR(conn, sr);
6162

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.cloud.agent.api.ModifyStoragePoolAnswer;
2929
import com.cloud.agent.api.ModifyStoragePoolCommand;
3030
import com.cloud.agent.api.to.StorageFilerTO;
31+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
3132
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
3233
import com.cloud.resource.CommandWrapper;
3334
import com.cloud.resource.ResourceWrapper;
@@ -49,7 +50,10 @@ public Answer execute(final ModifyStoragePoolCommand command, final CitrixResour
4950
final boolean add = command.getAdd();
5051
if (add) {
5152
try {
52-
final String srName = command.getStoragePath() != null ? command.getStoragePath() : pool.getUuid();
53+
String srName = command.getStoragePath();
54+
if (srName == null) {
55+
srName = CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath());
56+
}
5357
final SR sr = citrixResourceBase.getStorageRepository(conn, srName);
5458
citrixResourceBase.setupHeartbeatSr(conn, sr, false);
5559
final long capacity = sr.getPhysicalSize(conn);
@@ -75,7 +79,8 @@ public Answer execute(final ModifyStoragePoolCommand command, final CitrixResour
7579
}
7680
} else {
7781
try {
78-
final SR sr = citrixResourceBase.getStorageRepository(conn, pool.getUuid());
82+
final SR sr = citrixResourceBase.getStorageRepository(conn,
83+
CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
7984
final String srUuid = sr.getUuid(conn);
8085
final String result = citrixResourceBase.callHostPluginPremium(conn, "setup_heartbeat_file", "host", citrixResourceBase.getHost().getUuid(), "sr", srUuid, "add",
8186
"false");

‎plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,18 @@
5858
import com.cloud.exception.OperationTimedoutException;
5959
import com.cloud.host.Host;
6060
import com.cloud.hypervisor.Hypervisor.HypervisorType;
61-
import com.cloud.storage.dao.SnapshotDao;
62-
import com.cloud.storage.StoragePool;
61+
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
6362
import com.cloud.storage.Snapshot;
6463
import com.cloud.storage.SnapshotVO;
65-
import com.cloud.storage.VolumeVO;
64+
import com.cloud.storage.StoragePool;
6665
import com.cloud.storage.VolumeDetailVO;
66+
import com.cloud.storage.VolumeVO;
67+
import com.cloud.storage.dao.SnapshotDao;
6768
import com.cloud.storage.dao.VolumeDao;
6869
import com.cloud.storage.dao.VolumeDetailsDao;
69-
import com.cloud.utils.exception.CloudRuntimeException;
7070
import com.cloud.utils.Pair;
7171
import com.cloud.utils.StringUtils;
72+
import com.cloud.utils.exception.CloudRuntimeException;
7273
import com.cloud.vm.VMInstanceVO;
7374
import com.cloud.vm.dao.VMInstanceDao;
7475

@@ -326,7 +327,9 @@ private Answer migrateVmWithVolumesAcrossCluster(VMInstanceVO vm, VirtualMachine
326327
volumeToStorageUuid.add(new Pair<>(volumeTo, iqn));
327328
}
328329
else {
329-
volumeToStorageUuid.add(new Pair<>(volumeTo, ((StoragePool)entry.getValue()).getUuid()));
330+
StoragePool pool = (StoragePool)entry.getValue();
331+
String srNameLabel = CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getPoolType(), pool.getPath());
332+
volumeToStorageUuid.add(new Pair<>(volumeTo, srNameLabel));
330333
}
331334
}
332335

0 commit comments

Comments
 (0)