- Addressed code review comments: Added checking mdm removal response…

… validation
apache · DaanHoogland · Jul 16, 2025 · Apr 8, 2025 · Apr 9, 2025 · Apr 9, 2025
commit 4636ae925d5c339543d588afde63da1a5c7e3c45
diff --git a/...rvisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java b/...rvisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
@@ -194,6 +194,7 @@ public void testUnprepareStorageClient_RemoveMDMFailed() {
         details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, "1.1.1.1,2.2.2.2");
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl status scini"))).thenReturn(3);
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-enabled scini"))).thenReturn(0);
+        when(Script.executeCommand(Mockito.eq("sed -i '/1.1.1.1\\,/d' /etc/emc/scaleio/drv_cfg.txt"))).thenReturn(new Pair<>(null, null));
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl restart scini"))).thenReturn(0);
         when(Script.runSimpleBashScript(Mockito.eq("/opt/emc/scaleio/sdc/bin/drv_cfg --query_mdms --file /etc/emc/scaleio/drv_cfg.txt|grep 1.1.1.1"))).thenReturn("MDM-ID 71fd458f0775010f SDC ID 4421a91a00000000 INSTALLATION ID 204930df2cbcaf8e IPs [0]-1.1.1.1 [1]-2.2.2.2");
         when(Script.executeCommand(Mockito.eq("/opt/emc/scaleio/sdc/bin/drv_cfg"))).thenReturn(new Pair<>(null, null));

diff --git a/...olume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java b/...olume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
@@ -213,16 +213,19 @@ public static boolean removeMdms(String... mdmAddresses) {
             }
             // remove MDM via CLI if it is supported
             if (removeMdmCliSupported) {
-                removeMdm(mdmAddress);
                 if (removeMdm(mdmAddress)) {
                     changesApplied = true;
                 }
             } else {
                 String command = String.format(REMOVE_MDM_CMD_TEMPLATE, mdmAddress, DRV_CFG_FILE);
-                Script.runSimpleBashScript(command);
-                // restart SDC needed only if configuration file modified manually (not by CLI)
-                restartSDC = true;
-                changesApplied = true;
+                String stdErr = Script.executeCommand(command).second();
+                if(StringUtils.isEmpty(stdErr)) {
+                    // restart SDC needed only if configuration file modified manually (not by CLI)
+                    restartSDC = true;
+                    changesApplied = true;
+                } else {
+                    LOGGER.error(String.format("Failed to remove MDM %s from %s: %s", mdmAddress, DRV_CFG_FILE, stdErr));
+                }
             }
         }
         if (restartSDC) {