Skip to content

Commit 265b554

Browse files
weizhouapacheweizhouapache
committed
Fix 4.22 build failures after forward-merge and rename 42010to42100 to 42040to42100
1 parent c7e2c74 commit 265b554

6 files changed

Lines changed: 38 additions & 16 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
import com.cloud.upgrade.dao.Upgrade41900to41910;
9090
import com.cloud.upgrade.dao.Upgrade41910to42000;
9191
import com.cloud.upgrade.dao.Upgrade42000to42010;
92-
import com.cloud.upgrade.dao.Upgrade42010to42100;
93-
import com.cloud.upgrade.dao.Upgrade42200to42210;
9492
import com.cloud.upgrade.dao.Upgrade42020to42030;
9593
import com.cloud.upgrade.dao.Upgrade42030to42040;
94+
import com.cloud.upgrade.dao.Upgrade42040to42100;
9695
import com.cloud.upgrade.dao.Upgrade42100to42200;
96+
import com.cloud.upgrade.dao.Upgrade42200to42210;
9797
import com.cloud.upgrade.dao.Upgrade420to421;
9898
import com.cloud.upgrade.dao.Upgrade421to430;
9999
import com.cloud.upgrade.dao.Upgrade430to440;
@@ -241,9 +241,9 @@ public DatabaseUpgradeChecker() {
241241
.next("4.19.0.0", new Upgrade41900to41910())
242242
.next("4.19.1.0", new Upgrade41910to42000())
243243
.next("4.20.0.0", new Upgrade42000to42010())
244-
.next("4.20.1.0", new Upgrade42010to42100())
245244
.next("4.20.2.0", new Upgrade42020to42030())
246245
.next("4.20.3.0", new Upgrade42030to42040())
246+
.next("4.20.4.0", new Upgrade42040to42100())
247247
.next("4.21.0.0", new Upgrade42100to42200())
248248
.next("4.22.0.0", new Upgrade42200to42210())
249249
.build();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import com.cloud.utils.db.TransactionLegacy;
3333
import com.cloud.utils.exception.CloudRuntimeException;
3434

35-
public class Upgrade42010to42100 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
35+
public class Upgrade42040to42100 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
3636
private SystemVmTemplateRegistration systemVmTemplateRegistration;
3737

3838
@Override
3939
public String[] getUpgradableVersionRange() {
40-
return new String[] {"4.20.1.0", "4.21.0.0"};
40+
return new String[] {"4.20.4.0", "4.21.0.0"};
4141
}
4242

4343
@Override
@@ -52,7 +52,7 @@ public boolean supportsRollingUpgrade() {
5252

5353
@Override
5454
public InputStream[] getPrepareScripts() {
55-
final String scriptFile = "META-INF/db/schema-42010to42100.sql";
55+
final String scriptFile = "META-INF/db/schema-42040to42100.sql";
5656
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
5757
if (script == null) {
5858
throw new CloudRuntimeException("Unable to find " + scriptFile);
@@ -69,7 +69,7 @@ public void performDataMigration(Connection conn) {
6969

7070
@Override
7171
public InputStream[] getCleanupScripts() {
72-
final String scriptFile = "META-INF/db/schema-42010to42100-cleanup.sql";
72+
final String scriptFile = "META-INF/db/schema-42040to42100-cleanup.sql";
7373
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
7474
if (script == null) {
7575
throw new CloudRuntimeException("Unable to find " + scriptFile);

engine/schema/src/main/resources/META-INF/db/schema-42010to42100-cleanup.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-42040to42100-cleanup.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
-- under the License.
1717

1818
--;
19-
-- Schema upgrade cleanup from 4.20.1.0 to 4.21.0.0
19+
-- Schema upgrade cleanup from 4.20.4.0 to 4.21.0.0
2020
--;

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-42040to42100.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-- under the License.
1717

1818
--;
19-
-- Schema upgrade from 4.20.1.0 to 4.21.0.0
19+
-- Schema upgrade from 4.20.4.0 to 4.21.0.0
2020
--;
2121

2222
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'max_backups', 'INT(8) UNSIGNED NOT NULL DEFAULT 0 COMMENT ''Maximum number of backups to be retained''');

‎engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
import com.cloud.upgrade.dao.Upgrade41120to41200;
4545
import com.cloud.upgrade.dao.Upgrade41510to41520;
4646
import com.cloud.upgrade.dao.Upgrade41610to41700;
47-
import com.cloud.upgrade.dao.Upgrade42010to42100;
47+
import com.cloud.upgrade.dao.Upgrade42020to42030;
48+
import com.cloud.upgrade.dao.Upgrade42030to42040;
49+
import com.cloud.upgrade.dao.Upgrade42040to42100;
4850
import com.cloud.upgrade.dao.Upgrade452to453;
4951
import com.cloud.upgrade.dao.Upgrade453to460;
5052
import com.cloud.upgrade.dao.Upgrade460to461;
@@ -382,22 +384,42 @@ public void isNotStandalone() throws SQLException {
382384
}
383385

384386
@Test
385-
public void testCalculateUpgradePath42010to42100() {
387+
public void testCalculateUpgradePath42010to42030() {
386388

387389
final CloudStackVersion dbVersion = CloudStackVersion.parse("4.20.1.0");
388390
assertNotNull(dbVersion);
389391

390-
final CloudStackVersion currentVersion = CloudStackVersion.parse("4.21.0.0");
392+
final CloudStackVersion currentVersion = CloudStackVersion.parse("4.20.3.0");
391393
assertNotNull(currentVersion);
392394

393395
final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
394396
final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
395397

396398
assertNotNull(upgrades);
397399
assertEquals(1, upgrades.length);
398-
assertTrue(upgrades[0] instanceof Upgrade42010to42100);
400+
assertTrue(upgrades[0] instanceof Upgrade42020to42030);
399401

400-
assertArrayEquals(new String[]{"4.20.1.0", "4.21.0.0"}, upgrades[0].getUpgradableVersionRange());
402+
assertArrayEquals(new String[]{"4.20.2.0", "4.20.3.0"}, upgrades[0].getUpgradableVersionRange());
401403
assertEquals(currentVersion.toString(), upgrades[0].getUpgradedVersion());
402404
}
405+
406+
@Test
407+
public void testCalculateUpgradePath42010to42100() {
408+
409+
final CloudStackVersion dbVersion = CloudStackVersion.parse("4.20.1.0");
410+
assertNotNull(dbVersion);
411+
412+
final CloudStackVersion currentVersion = CloudStackVersion.parse("4.21.0.0");
413+
assertNotNull(currentVersion);
414+
415+
final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
416+
final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
417+
418+
assertNotNull(upgrades);
419+
assertEquals(3, upgrades.length);
420+
assertTrue(upgrades[0] instanceof Upgrade42020to42030);
421+
assertTrue(upgrades[1] instanceof Upgrade42030to42040);
422+
assertTrue(upgrades[2] instanceof Upgrade42040to42100);
423+
assertEquals(currentVersion.toString(), upgrades[2].getUpgradedVersion());
424+
}
403425
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import com.cloud.utils.db.TransactionLegacy;
3636

3737
@RunWith(MockitoJUnitRunner.class)
38-
public class Upgrade42010to42100Test {
38+
public class Upgrade42040to42100Test {
3939
@Spy
40-
Upgrade42010to42100 upgrade;
40+
Upgrade42040to42100 upgrade;
4141

4242
@Mock
4343
private Connection conn;

0 commit comments

Comments
 (0)