You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2023/05/31 11:58:37 UTC
[cloudstack] 06/23: Pivot changes
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch LiveStoragMigrationScaleIOMain
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5ffb415792c3ee2a8148ab44516d3573bc94a4f5
Author: Harikrishna Patnala <ha...@gmail.com>
AuthorDate: Tue Mar 7 17:37:03 2023 +0530
Pivot changes
---
.../kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
index 6ff437cd44c..b6930683069 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
@@ -39,6 +39,7 @@ import java.util.Map;
import java.util.UUID;
import com.cloud.storage.Storage;
+import com.sun.jna.Pointer;
import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClient;
import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
@@ -53,6 +54,9 @@ import org.libvirt.LibvirtException;
import org.libvirt.event.BlockJobListener;
import org.libvirt.event.BlockJobStatus;
import org.libvirt.event.BlockJobType;
+import org.libvirt.jna.ConnectionPointer;
+import org.libvirt.jna.DomainPointer;
+import org.libvirt.jna.Libvirt;
@ResourceWrapper(handles = MigrateVolumeCommand.class)
public final class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<MigrateVolumeCommand, Answer, LibvirtComputingResource> {
@@ -122,7 +126,6 @@ public final class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<Mig
TypedUlongParameter parameter = new TypedUlongParameter("bandwidth", 0);
TypedParameter[] parameters = new TypedParameter[1];
parameters[0] = parameter;
- LOGGER.info("Krishna source disk label: " + diskdef.getDiskLabel());
Domain finalDm = dm;
final Boolean[] copyStatus = {true};
@@ -132,7 +135,7 @@ public final class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<Mig
public void onEvent(Domain domain, String diskPath, BlockJobType type, BlockJobStatus status) {
if (type == BlockJobType.COPY && status == BlockJobStatus.READY) {
try {
- finalDm.blockJobAbort(diskFilePath, 0);
+ finalDm.blockJobAbort(diskFilePath, Domain.BlockJobAbortFlags.PIVOT);
copyStatus[0] = false;
} catch (LibvirtException e) {
throw new RuntimeException(e);