implement upgrade path from 4.6.0 to 4.6.1

[remibergsma]

The 4.6 branch needs an upgrade path to 4.6.1. I looked at how this was done before and think this will do. Can you give it a second pair of eyes please @DaanHoogland ?

When this is indeed OK, I'll do the same for master for the 4.6.0 -> 4.7.0 path.

I've tried a build and that works: mvn clean install

[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 07:33 min
[INFO] Finished at: 2015-11-15T13:45:58+01:00
[INFO] Final Memory: 120M/1591M
[INFO] ------------------------------------------------------------------------

Once this is a PR, I'll try an actual upgrade from 4.6.0 to 4.6.1-SNAPSHOT.

[DaanHoogland]

looks good, let's run a test anyway. the jenkins should run it but it it's running on a INFRA-10703 host so it will most likely fail.

[remibergsma]

@DaanHoogland I rebased it, as it needs the checkstyle fix in 4.6.

[DaanHoogland]

merged with 4.6 branch and:

INFO  [c.c.s.ManagementServerImpl] (main:ctx-1c73e37e) Startup CloudStack management server...
INFO  [c.c.c.ClusterManagerImpl] (main:ctx-1c73e37e) register cluster listener class com.cloud.server.LockMasterListener
INFO  [c.c.c.ClusterManagerImpl] (Cluster-Heartbeat-1:ctx-62e492b0) We are good, no orphan management server msid in host table is found
INFO  [c.c.c.ClusterManagerImpl] (Cluster-Heartbeat-1:ctx-62e492b0) No inactive management server node found
WARN  [o.a.c.alerts] (Cluster-Notification-1:ctx-7db732cd)  alertType:: 14 // dataCenterId:: 0 // podId:: 0 // clusterId:: null // message:: Management server node 127.0.0.1 is up
WARN  [c.c.c.ClusterManagerImpl] (Cluster-Notification-1:ctx-7db732cd) Notifying management server join event took 9 ms

LGTM

[remibergsma]

This is an upgrade from 4.6.0 to 4.6.1:

INFO  [o.a.c.s.l.CloudStackExtendedLifeCycle] (main:null) Running system integrity checker com.cloud.upgrade.DatabaseUpgradeChecker@419c5949
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.6.1-SNAPSHOT
INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) Database upgrade must be performed from 4.6.0 to 4.6.1-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 Upgrade460to461 to upgrade from 4.6.0-4.6.1 to 4.6.1
INFO  [o.a.c.s.l.CloudStackExtendedLifeCycle] (main:null) Configuring CloudStack Components

The database shows:

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 |
+----+---------+---------------------+----------+
13 rows in set (0.00 sec)

I'd say this works as expected :-)

Pinging @DaanHoogland

[DaanHoogland]

so, you have my lgtm, need a second one?

[remibergsma]

Yes, let's stick to the rules :-)

[milamberspace]

LGTM
Works on my test deployment.

2015-11-15 19:52:41,711 DEBUG c.c.u.DatabaseUpgradeChecker Cleanup script /usr/share/cloudstack-management/setup/db/schema-460to461-cleanup.sql is executed successfully
2015-11-15 19:52:41,736 DEBUG c.c.u.DatabaseUpgradeChecker Upgrade completed for version 4.6.1

[wilderrodrigues]

Hi,

@remibergsma and @DaanHoogland tested this PR and I reviewed the code. it LGTM 👍

Cheers,
Wilder