Skip to content

Make master 4.7.0-SNAPSHOT and implement upgrade paths towards it - #1068

Merged
asfgit merged 3 commits into
apache:masterfrom
remibergsma:460_470_upgrade_path
Nov 16, 2015
Merged

Make master 4.7.0-SNAPSHOT and implement upgrade paths towards it#1068
asfgit merged 3 commits into
apache:masterfrom
remibergsma:460_470_upgrade_path

Conversation

@remibergsma

@remibergsma remibergsma commented Nov 15, 2015

Copy link
Copy Markdown
Contributor

This bumps all pom.xml versions to 4.7.0-SNAPSHOT. It also implements upgrade paths from 4.6.0 and the upcoming 4.6.1 (branch 4.6 is now on 4.6.1-SNAPSHOT) towards 4.7.0.

I will be doing some upgrade tests, will post back results soon.

@remibergsma

remibergsma commented Nov 15, 2015

Copy link
Copy Markdown
Contributor Author

This is an upgrade from 4.6.1 to 4.7.0:

INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) DB version = 4.6.1 Code Version = 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Database upgrade must be performed from 4.6.1 to 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleaning upgrades because all management server are now at the same version
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleanup upgrade Upgrade461to470 to upgrade from 4.6.1-4.7.0 to 4.7.0

Database:

MariaDB [cloud]> select * from version;
+----+---------+---------------------+----------+
| id | version | updated             | step     |
+----+---------+---------------------+----------+
|  1 | 4.0.0   | 2015-11-06 13:33:14 | Complete |
|  2 | 4.1.0   | 2015-11-06 13:33:25 | Complete |
|  3 | 4.2.0   | 2015-11-06 13:33:25 | Complete |
|  4 | 4.2.1   | 2015-11-06 13:33:25 | Complete |
|  5 | 4.3.0   | 2015-11-06 13:33:25 | Complete |
|  6 | 4.4.0   | 2015-11-06 13:33:26 | Complete |
|  7 | 4.4.1   | 2015-11-06 13:33:26 | Complete |
|  8 | 4.4.2   | 2015-11-06 13:33:26 | Complete |
|  9 | 4.5.0   | 2015-11-06 13:33:26 | Complete |
| 10 | 4.5.1   | 2015-11-06 13:33:26 | Complete |
| 11 | 4.5.2   | 2015-11-06 13:33:26 | Complete |
| 12 | 4.6.0   | 2015-11-06 13:33:26 | Complete |
| 13 | 4.6.1   | 2015-11-15 15:38:58 | Complete |
| 14 | 4.7.0   | 2015-11-15 18:35:05 | Complete |
+----+---------+---------------------+----------+
14 rows in set (0.00 sec)

Will try an upgrade from 4.6.0 to 4.7.0 as well.

@remibergsma

remibergsma commented Nov 15, 2015

Copy link
Copy Markdown
Contributor Author

This is an 4.6.0 to 4.7.0 upgrade:

INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) DB version = 4.6.0 Code Version = 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Database upgrade must be performed from 4.6.0 to 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleaning upgrades because all management server are now at the same version
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleanup upgrade Upgrade460to470 to upgrade from 4.6.0-4.7.0 to 4.7.0

Database:

MariaDB [cloud]> select * from version;
+----+---------+---------------------+----------+
| id | version | updated             | step     |
+----+---------+---------------------+----------+
|  1 | 4.0.0   | 2015-11-10 15:51:18 | Complete |
|  2 | 4.1.0   | 2015-11-10 15:51:28 | Complete |
|  3 | 4.2.0   | 2015-11-10 15:51:28 | Complete |
|  4 | 4.2.1   | 2015-11-10 15:51:28 | Complete |
|  5 | 4.3.0   | 2015-11-10 15:51:28 | Complete |
|  6 | 4.4.0   | 2015-11-10 15:51:28 | Complete |
|  7 | 4.4.1   | 2015-11-10 15:51:28 | Complete |
|  8 | 4.4.2   | 2015-11-10 15:51:28 | Complete |
|  9 | 4.5.0   | 2015-11-10 15:51:28 | Complete |
| 10 | 4.5.1   | 2015-11-10 15:51:28 | Complete |
| 11 | 4.5.2   | 2015-11-10 15:51:28 | Complete |
| 12 | 4.6.0   | 2015-11-10 15:51:28 | Complete |
| 13 | 4.7.0   | 2015-11-15 19:20:03 | Complete |
+----+---------+---------------------+----------+
13 rows in set (0.00 sec)

@milamberspace

milamberspace commented Nov 15, 2015

Copy link
Copy Markdown
Contributor

LGTM

Tested on a 4.6.1 to 4.70 with success

2015-11-15 22:00:04,726 DEBUG c.c.u.DatabaseUpgradeChecker Cleanup script /usr/share/cloudstack-management/setup/db/schema-461to470-cleanup.sql is executed successfully
2015-11-15 22:00:04,764 DEBUG c.c.u.DatabaseUpgradeChecker Upgrade completed for version 4.7.0

@DaanHoogland

DaanHoogland commented Nov 15, 2015

Copy link
Copy Markdown
Contributor

compiled and started with no errors. tests are running but irrelevant for this PR: LGTM

@karuturi

karuturi commented Nov 16, 2015

Copy link
Copy Markdown
Member

4.6 has 4.6 to 4.6.1 upgrade path
and master has 4.6 to 4.7 upgrade path

once 4.6 is merged to master, wont there be a problem with upgrade path on master? May be we should do a manual edit of the upgrade paths during the first merge of 4.6 to master?

@karuturi

karuturi commented Nov 16, 2015

Copy link
Copy Markdown
Member

remi mentioned on slack that master already has 461to470. so, the merge wont be a problem.
In future, during the first merge after any release, we should take care of the upgrade paths (or better yet, move to commit to commit upgrades using something like liquibase or flywaydb :) )

successfully upgraded from 4.6.0 to 4.7.0.

INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Grabbing lock to check for database upgrade.
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) DB version = 4.6.0 Code Version = 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Database upgrade must be performed from 4.6.0 to 4.7.0-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleaning upgrades because all management server are now at the same version
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Cleanup upgrade Upgrade460to470 to upgrade from 4.6.0-4.7.0 to 4.7.0

👍

@asfgit
asfgit merged commit 704cbe0 into apache:master Nov 16, 2015
asfgit pushed a commit that referenced this pull request Nov 16, 2015
@remibergsma
Merge pull request #1068 from remibergsma/460_470_upgrade_path
ea7c2d9 
Make master 4.7.0-SNAPSHOT and implement upgrade paths towards itThis bumps all pom.xml versions to 4.7.0-SNAPSHOT. It also implements upgrade paths from 4.6.0 and the upcoming 4.6.1 (branch 4.6 is now on 4.6.1-SNAPSHOT) towards 4.7.0.

I will be doing some upgrade tests, will post back results soon.

* pr/1068:
  Add 4.7.0-SNAPSHOT to Debian changelog
  implement upgrade paths from 4.6.0/4.6.1 to 4.7.0
  Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

Signed-off-by: Remi Bergsma <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

See More

Successfully merging this pull request may close these issues.

5 participants

@remibergsma @milamberspace @DaanHoogland @karuturi @asfgit