fixed 41720to41800 upgrade path

Author: abh1sar

engine/schema/src/main/java/com/cloud/upgrade/ConfigurationGroupsAggregator.java

@@ -32,6 +32,9 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.utils.Pair;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -54,7 +57,12 @@ public ConfigurationGroupsAggregator() {
 
     public void updateConfigurationGroups() {
         LOG.debug("Updating configuration groups");
-        List<ConfigurationVO> configs =  configDao.listAllIncludingRemoved();
+        SearchBuilder<ConfigurationVO> sb = configDao.createSearchBuilder();
+        sb.select("name", SearchCriteria.Func.NATIVE, sb.entity().getName());
+        sb.select("groupId", SearchCriteria.Func.NATIVE, sb.entity().getGroupId());
+        sb.select("subGroupId", SearchCriteria.Func.NATIVE, sb.entity().getSubGroupId());
+        SearchCriteria<ConfigurationVO> sc = sb.create();
+        List<ConfigurationVO> configs =  configDao.searchIncludingRemoved(sc, null, null, false);
         if (CollectionUtils.isEmpty(configs)) {
             return;
         }

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

@@ -100,24 +100,19 @@ public String getColumnType(Connection conn, String tableName, String columnName
     }
 
     public void addColumn(Connection conn, String tableName, String columnName, String columnDefinition) {
-        System.out.println("------------------------" + String.format("ALTER TABLE %s ADD COLUMN %s %s", tableName, columnName, columnDefinition));
         try (PreparedStatement pstmt = conn.prepareStatement(String.format("ALTER TABLE %s ADD COLUMN %s %s", tableName, columnName, columnDefinition));){
             pstmt.executeUpdate();
-            System.out.println("column added------------------------" + String.format("ALTER TABLE %s ADD COLUMN %s %s", tableName, columnName, columnDefinition));
             logger.debug("Column {} is added successfully from the table {}", columnName, tableName);
         } catch (SQLException e) {
-            System.out.println("column not added------------------------" + e.getMessage());
             logger.warn("Unable to add column {} to table {} due to exception", columnName, tableName, e);
         }
     }
 
     public void changeColumn(Connection conn, String tableName, String oldColumnName, String newColumnName, String columnDefinition) {
         try (PreparedStatement pstmt = conn.prepareStatement(String.format("ALTER TABLE %s CHANGE COLUMN %s %s %s", tableName, oldColumnName, newColumnName, columnDefinition));){
             pstmt.executeUpdate();
-            System.out.println("column changed------------------------" + String.format("ALTER TABLE %s CHANGE COLUMN %s %s %s", tableName, oldColumnName, newColumnName, columnDefinition));
             logger.debug("Column {} is changed successfully to {} from the table {}", oldColumnName, newColumnName, tableName);
         } catch (SQLException e) {
-            System.out.println("column not changed------------------------" + e.getMessage());
             logger.warn("Unable to add column {} to {} from the table {} due to exception", oldColumnName, newColumnName, tableName, e);
         }
     }

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

@@ -711,6 +711,6 @@ private void correctGuestOsIdsInHypervisorMapping(final Connection conn) {
     }
 
     private void updateConfigurationGroups() {
-//        configGroupsAggregator.updateConfigurationGroups();
+        configGroupsAggregator.updateConfigurationGroups();
     }
 }