Skip to content

Commit 9b3c318

Browse files
upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (apache#8893)
This PR move upgrade files for 4.19.0->4.20.0 to 4.19.1->4.20.0
1 parent 5433e77 commit 9b3c318

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import javax.inject.Inject;
3535

36-
import com.cloud.upgrade.dao.Upgrade41900to42000;
3736
import com.cloud.utils.FileUtil;
3837
import org.apache.cloudstack.utils.CloudStackVersion;
3938
import org.apache.commons.lang3.StringUtils;
@@ -87,6 +86,8 @@
8786
import com.cloud.upgrade.dao.Upgrade41720to41800;
8887
import com.cloud.upgrade.dao.Upgrade41800to41810;
8988
import com.cloud.upgrade.dao.Upgrade41810to41900;
89+
import com.cloud.upgrade.dao.Upgrade41900to41910;
90+
import com.cloud.upgrade.dao.Upgrade41910to42000;
9091
import com.cloud.upgrade.dao.Upgrade420to421;
9192
import com.cloud.upgrade.dao.Upgrade421to430;
9293
import com.cloud.upgrade.dao.Upgrade430to440;
@@ -226,7 +227,8 @@ public DatabaseUpgradeChecker() {
226227
.next("4.17.2.0", new Upgrade41720to41800())
227228
.next("4.18.0.0", new Upgrade41800to41810())
228229
.next("4.18.1.0", new Upgrade41810to41900())
229-
.next("4.19.0.0", new Upgrade41900to42000())
230+
.next("4.19.0.0", new Upgrade41900to41910())
231+
.next("4.19.1.0", new Upgrade41910to42000())
230232
.build();
231233
}
232234

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java renamed to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import com.cloud.upgrade.SystemVmTemplateRegistration;
2323
import com.cloud.utils.exception.CloudRuntimeException;
2424

25-
public class Upgrade41900to42000 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
25+
public class Upgrade41910to42000 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
2626
private SystemVmTemplateRegistration systemVmTemplateRegistration;
2727

2828
@Override
2929
public String[] getUpgradableVersionRange() {
30-
return new String[] {"4.19.0.0", "4.20.0.0"};
30+
return new String[] {"4.19.1.0", "4.20.0.0"};
3131
}
3232

3333
@Override
@@ -42,7 +42,7 @@ public boolean supportsRollingUpgrade() {
4242

4343
@Override
4444
public InputStream[] getPrepareScripts() {
45-
final String scriptFile = "META-INF/db/schema-41900to42000.sql";
45+
final String scriptFile = "META-INF/db/schema-41910to42000.sql";
4646
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
4747
if (script == null) {
4848
throw new CloudRuntimeException("Unable to find " + scriptFile);
@@ -57,7 +57,7 @@ public void performDataMigration(Connection conn) {
5757

5858
@Override
5959
public InputStream[] getCleanupScripts() {
60-
final String scriptFile = "META-INF/db/schema-41900to42000-cleanup.sql";
60+
final String scriptFile = "META-INF/db/schema-41910to42000-cleanup.sql";
6161
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
6262
if (script == null) {
6363
throw new CloudRuntimeException("Unable to find " + scriptFile);

0 commit comments

Comments
 (0)