core: add sd_id to detachManagedBlockVolume

Since multiple volumes with the same id can be attached to the same host (live storage migration for example), we now send the sd_id as well to be able to distinguish between them. Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com>
oVirt · Jun 2, 2022 · 6fcc5e7 · 6fcc5e7
1 parent ab71651
commit 6fcc5e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...engine/core/bll/storage/disk/managedblock/DisconnectManagedBlockStorageDeviceCommand.java b/...engine/core/bll/storage/disk/managedblock/DisconnectManagedBlockStorageDeviceCommand.java
@@ -76,6 +76,7 @@ private VDSReturnValue detachVolume() {
         AttachManagedBlockStorageVolumeVDSCommandParameters params =
                 new AttachManagedBlockStorageVolumeVDSCommandParameters(vds);
         params.setVolumeId(getParameters().getDiskId());
+        params.setStorageDomainId(getParameters().getStorageDomainId());
         return runVdsCommand(VDSCommandType.DetachManagedBlockStorageVolume, params);
     }
 

diff --git a/...les/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/...les/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
@@ -2643,10 +2643,11 @@ public DeviceInfoReturn attachManagedBlockStorageVolume(Guid volumeId, Guid sdUU
     }
 
     @Override
-    public StatusOnlyReturn detachManagedBlockStorageVolume(Guid volumeId) {
+    public StatusOnlyReturn detachManagedBlockStorageVolume(Guid volumeId, Guid sdUUID) {
         JsonRpcRequest request =
                 new RequestBuilder("ManagedVolume.detach_volume")
                         .withParameter("vol_id", volumeId.toString())
+                        .withParameter("sd_id", sdUUID.toString())
                         .build();
         Map<String, Object> response = new FutureMap(this.client, request);
         return new StatusOnlyReturn(response);

diff --git a/.../org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java b/.../org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java
@@ -10,7 +10,8 @@ public DetachManagedBlockStorageVolumeVDSCommand(P parameters) {
 
     @Override
     protected void executeVdsBrokerCommand() {
-        status = getBroker().detachManagedBlockStorageVolume(getParameters().getVolumeId());
+        status = getBroker().detachManagedBlockStorageVolume(getParameters().getVolumeId(),
+                getParameters().getStorageDomainId());
         proceedProxyReturnValue();
         setReturnValue(status);
     }