fix db schema after rebase

Author: abh1sar

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

@@ -89,6 +89,7 @@
 import com.cloud.upgrade.dao.Upgrade41900to41910;
 import com.cloud.upgrade.dao.Upgrade41910to42000;
 import com.cloud.upgrade.dao.Upgrade42000to42010;
+import com.cloud.upgrade.dao.Upgrade42010to42020;
 import com.cloud.upgrade.dao.Upgrade420to421;
 import com.cloud.upgrade.dao.Upgrade421to430;
 import com.cloud.upgrade.dao.Upgrade430to440;
@@ -232,6 +233,7 @@ public DatabaseUpgradeChecker() {
                 .next("4.19.0.0", new Upgrade41900to41910())
                 .next("4.19.1.0", new Upgrade41910to42000())
                 .next("4.20.0.0", new Upgrade42000to42010())
+                .next("4.20.1.0", new Upgrade42010to42020())
                 .build();
     }
 

…oud/upgrade/dao/Upgrade41930to41940.java …oud/upgrade/dao/Upgrade42010to42020.javaengine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41930to41940.java renamed to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42010to42020.java engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41930to41940.java renamed to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42010to42020.java

@@ -21,16 +21,16 @@
 
 import com.cloud.utils.exception.CloudRuntimeException;
 
-public class Upgrade41930to41940 implements DbUpgrade {
+public class Upgrade42010to42020 implements DbUpgrade {
 
     @Override
     public String[] getUpgradableVersionRange() {
-        return new String[]{"4.19.3.0", "4.19.4.0"};
+        return new String[]{"4.20.1.0", "4.20.2.0"};
     }
 
     @Override
     public String getUpgradedVersion() {
-        return "4.19.4.0";
+        return "4.20.2.0";
     }
 
     @Override
@@ -40,7 +40,7 @@ public boolean supportsRollingUpgrade() {
 
     @Override
     public InputStream[] getPrepareScripts() {
-        final String scriptFile = "META-INF/db/schema-41930to41940.sql";
+        final String scriptFile = "META-INF/db/schema-42010to42020.sql";
         final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
         if (script == null) {
             throw new CloudRuntimeException("Unable to find " + scriptFile);

engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDaoImpl.java

@@ -26,7 +26,6 @@
 
 import javax.annotation.PostConstruct;
 
-import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.usage.UsageVolumeVO;

…rces/META-INF/db/schema-41930to41940.sql …rces/META-INF/db/schema-42010to42020.sqlengine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-42010to42020.sql engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-42010to42020.sql

@@ -16,7 +16,7 @@
 -- under the License.
 
 --;
--- Schema upgrade from 4.19.3.0 to 4.19.4.0
+-- Schema upgrade from 4.20.1.0 to 4.20.2.0
 --;
 
 -- Add vm_id column to usage_event table for volume usage events

usage/src/main/java/com/cloud/usage/UsageManagerImpl.java

@@ -1546,7 +1546,7 @@ private void createIPHelperEvent(UsageEventVO event) {
     private void deleteExistingSecondaryStorageUsageForVolume(long volId, long accountId, Date deletedDate) {
         List<UsageStorageVO> storageVOs = _usageStorageDao.listById(accountId, volId, StorageTypes.VOLUME);
         for (UsageStorageVO storageVO : storageVOs) {
-            s_logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
+            logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
             storageVO.setDeleted(deletedDate);
             _usageStorageDao.update(storageVO);
         }
@@ -1556,7 +1556,7 @@ private void deleteExistingInstanceVolumeUsage(long volId, long accountId, Date
         List<UsageVolumeVO> volumesVOs = _usageVolumeDao.listByVolumeId(volId, accountId);
         for (UsageVolumeVO volumesVO : volumesVOs) {
             if (volumesVO.getVmId() != null) {
-                s_logger.debug(String.format("Setting the volume with id: {} for instance id: {} to 'deleted' in the usage_volume table for account {}.",
+                logger.debug(String.format("Setting the volume with id: {} for instance id: {} to 'deleted' in the usage_volume table for account {}.",
                         volumesVO.getVolumeId(), volumesVO.getVmId(), accountId));
                 volumesVO.setDeleted(deletedDate);
                 _usageVolumeDao.update(volumesVO.getId(), volumesVO);
@@ -1567,7 +1567,7 @@ private void deleteExistingInstanceVolumeUsage(long volId, long accountId, Date
     private void deleteExistingVolumeUsage(long volId, long accountId, Date deletedDate) {
         List<UsageVolumeVO> volumesVOs = _usageVolumeDao.listByVolumeId(volId, accountId);
         for (UsageVolumeVO volumesVO : volumesVOs) {
-            s_logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
+            logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
             volumesVO.setDeleted(deletedDate);
             _usageVolumeDao.update(volumesVO.getId(), volumesVO);
         }