Use configDepot.isNewConfig() to populate volume.allocation.algorithm

Author: sudo87

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -38,6 +38,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.deploy.DeploymentClusterPlanner;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.VMTemplateVO;
@@ -73,6 +74,7 @@
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
 import org.apache.cloudstack.resourcedetail.DiskOfferingDetailVO;
@@ -257,6 +259,10 @@ public enum UserVmCloneType {
     StoragePoolHostDao storagePoolHostDao;
     @Inject
     DiskOfferingDao diskOfferingDao;
+    @Inject
+    ConfigDepot configDepot;
+    @Inject
+    ConfigurationDao configurationDao;
 
     @Inject
     protected SnapshotHelper snapshotHelper;
@@ -2033,6 +2039,18 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         return true;
     }
 
+    @Override
+    public boolean start() {
+        if (configDepot.isNewConfig(VolumeOrchestrationService.VolumeAllocationAlgorithm)) {
+            String vmAllocationAlgo = DeploymentClusterPlanner.VmAllocationAlgorithm.value();
+            if (com.cloud.utils.StringUtils.isNotEmpty(vmAllocationAlgo) && !"random".equalsIgnoreCase(vmAllocationAlgo)) {
+                logger.debug("Updating value for configuration: {} to {}", VolumeOrchestrationService.VolumeAllocationAlgorithm.key(), vmAllocationAlgo);
+                configurationDao.update(VolumeOrchestrationService.VolumeAllocationAlgorithm.key(), vmAllocationAlgo);
+            }
+        }
+        return true;
+    }
+
     private void cleanupVolumeDuringAttachFailure(Long volumeId, Long vmId) {
         VolumeVO volume = _volsDao.findById(volumeId);
         if (volume == null) {

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42010to42100.java

@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
@@ -61,7 +60,6 @@ public InputStream[] getPrepareScripts() {
     @Override
     public void performDataMigration(Connection conn) {
         migrateConfigurationScopeToBitmask(conn);
-        migrateVolumeAllocationAlgorithm(conn);
     }
 
     @Override
@@ -120,38 +118,4 @@ protected void migrateExistingConfigurationScopeValues(Connection conn) {
             throw new CloudRuntimeException(String.format("Failed to migrate existing configuration scope values to bitmask due to: %s", e.getMessage()));
         }
     }
-
-    void migrateVolumeAllocationAlgorithm(Connection conn) {
-        ResultSet rs = null;
-        PreparedStatement pstmt = null;
-        try {
-            String vmAllocationAlgo = "random";
-            pstmt = conn.prepareStatement("SELECT value FROM `cloud`.`configuration` where name = 'vm.allocation.algorithm'");
-            rs = pstmt.executeQuery();
-            if (rs.next()) {
-                vmAllocationAlgo = rs.getString(1);
-            }
-            rs.close();
-            pstmt.close();
-
-            if (!"random".equalsIgnoreCase(vmAllocationAlgo)) {
-                pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = 'volume.allocation.algorithm'");
-                pstmt.setString(1, vmAllocationAlgo);
-                pstmt.executeUpdate();
-            }
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Unable to migrate the volume.allocation.algorithm", e);
-        } finally {
-            try {
-                if (rs != null) {
-                    rs.close();
-                }
-                if (pstmt != null) {
-                    pstmt.close();
-                }
-            } catch (SQLException e) {
-                logger.info("[ignored]",e);
-            }
-        }
-    }
 }

engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42010to42100Test.java

@@ -16,15 +16,12 @@
 // under the License.
 package com.cloud.upgrade.dao;
 
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -40,24 +37,9 @@ public class Upgrade42010to42100Test {
     @Spy
     Upgrade42010to42100 upgrade;
 
-    @Mock
-    private PreparedStatement mockPreparedStatement;
-    @Mock
-    private ResultSet mockResultSet;
     @Mock
     private Connection conn;
 
-
-    @Before
-    public void setup() throws Exception {
-        when(conn.prepareStatement("SELECT value FROM `cloud`.`configuration` where name = 'vm.allocation.algorithm'"))
-                .thenReturn(mockPreparedStatement);
-        when(mockPreparedStatement.executeQuery()).thenReturn(mockResultSet);
-        when(mockResultSet.next()).thenReturn(true);
-        when(mockResultSet.getString(1)).thenReturn("random");
-    }
-
-
     @Test
     public void testPerformDataMigration() throws SQLException {
         try (MockedStatic<DbUpgradeUtils> ignored = Mockito.mockStatic(DbUpgradeUtils.class)) {
@@ -88,17 +70,4 @@ public void testPerformDataMigration() throws SQLException {
             }
         }
     }
-
-    @Test
-    public void testPerformDataMigrationShouldUpdateVolumeAlgorithm() throws SQLException {
-        when(mockResultSet.getString(1)).thenReturn("userdispersing");
-
-        PreparedStatement updateStmt = Mockito.mock(PreparedStatement.class);
-        when(conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = 'volume.allocation.algorithm'"))
-                .thenReturn(updateStmt);
-        doNothing().when(upgrade).migrateConfigurationScopeToBitmask(conn);
-        upgrade.performDataMigration(conn);
-        Mockito.verify(updateStmt).setString(1, "userdispersing");
-        Mockito.verify(updateStmt).executeUpdate();
-    }
 }