Skip to content

CLOUDSTACK-9792: Add upgrade path for 4.9.3.0#1951

Merged
asfgit merged 3 commits intoapache:4.9from
shapeblue:4930-upgradepath
May 19, 2017
Merged

CLOUDSTACK-9792: Add upgrade path for 4.9.3.0#1951
asfgit merged 3 commits intoapache:4.9from
shapeblue:4930-upgradepath

Conversation

@yadvr
Copy link
Member

@yadvr yadvr commented Feb 17, 2017

This adds an upgrade path from 4.9.2.0 to 4.9.3.0, this also includes changes from PR #1928 that adds missing hypervisor capability in 4.9/4.10+. This also fixes a db-cleanup path sequence issues, with that puts 4.10 after 4.1.0, and before 4.2.0.

Once validated I can help merge this on master, since this will cause merge conflicts on fwd-merging.

Ping - @syed @karuturi @borisstoyanov @DaanHoogland @abhinandanprateek

-- Schema upgrade from 4.9.2.0 to 4.9.3.0;
--;

INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, max_data_volumes_limit, storage_motion_supported) values (UUID(), 'XenServer', '7.0.0', 500, 13, 1);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: On fwd merging, this can be re-executed in 4.9.2.0->4.10.0.0 upgrade path.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhtyd I thought that this would be in the 4.9.2.0->4.9.3.0 path which is a subset to the 4.10.0.0 path. So in theory, it should be only executed once correct?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@syed depends on which we release first I'd say.

@borisstoyanov
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-504

@borisstoyanov
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@yadvr
Copy link
Member Author

yadvr commented Feb 17, 2017

@borisstoyanov an explicit integration test is not necessary if Travis passes, since all changes are around db upgrade/version.

@borisstoyanov
Copy link
Contributor

Just want to confirm it fresh installs and upgrades the DB to 4.9.3. will cancel the run after as I'm planning to do an upgrade scenario as well.
Thanks @rhtyd

Copy link
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to fresh install and upgrade this PR. In both cases DB got upgraded without any issues
LGTM

@yadvr
Copy link
Member Author

yadvr commented Feb 21, 2017

Thanks @borisstoyanov
@karuturi ping

@yadvr
Copy link
Member Author

yadvr commented Feb 22, 2017

Requesting for review - @DaanHoogland @abhinandanprateek @karuturi @koushik-das @syed

@koushik-das
Copy link
Contributor

I already see schema-4920to41000.sql and the corresponding cleanup file in master. So how will this fit in the overall scheme? Is there any plans for 4.9.3?

@yadvr
Copy link
Member Author

yadvr commented Feb 22, 2017

@koushik-das there is plan for 4.9.3, though the db schema change to insert/update the hypervisor capability need to go into 4.10.0 either with this PR carefully fwd-merged (which I can help with) or as a separate PR targeted only for 4.10. 4.9.x should not have unnecessary db changes, therefore 4.9.2->4.9.3 is not expected of any other db changes, with this assumption and that 4.9.3 should be worked upon in next few months this would add an upgrade path from both 4.9.2/4.9.3 to 4.10.0.

@syed
Copy link
Contributor

syed commented Feb 22, 2017

@rhtyd If I understand correctly if we add the DB changes in 4.9.2->4.9.3 then after forward merging, upgrade from 4.9.2->4.10.0 should not have any problems with idempotency correct?

@yadvr
Copy link
Member Author

yadvr commented Feb 26, 2017

@syed yes there is no problem I see, with INSERT IGNORE we can have this db change in both paths resulting in same final state.

@syed
Copy link
Contributor

syed commented Feb 27, 2017

Thanks @rhtyd for confirming. LGTM 👍

@yadvr
Copy link
Member Author

yadvr commented Mar 26, 2017

ping @karuturi let's merge this?

@yadvr
Copy link
Member Author

yadvr commented Apr 6, 2017

Ping @karuturi

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@karuturi
Copy link
Member

@rhtyd Can you merge this and also fwd-merge to master?

@yadvr
Copy link
Member Author

yadvr commented May 17, 2017

@karuturi thanks, this will require some merge-conflicts on master. Will do it later today or tomorrow. Since it's not a blocker for 4.10 and 4.9.3 release work has not started, I'll assume this a low priority.

yadvr and others added 2 commits May 18, 2017 13:26
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr yadvr force-pushed the 4930-upgradepath branch from 8d87620 to eed54e0 Compare May 18, 2017 08:17
@yadvr
Copy link
Member Author

yadvr commented May 18, 2017

@resmo @FabriceBrazier @karuturi I've moved from commits/changes from #2111 and eee1e1a to 4.9.3.0 upgrade path. If you're all okay with this, I can fwd-merge this as follows:

  • Once merged, we'll freeze the schema changes for 4.9.3.0 (i.e. the 4.9.2.0->4.9.3.0 upgrade path)
  • I'll fwd-merge this into master, fix conflicts and refactor/rename the upgrade path 4.9.2.0->4.10.0.0 to 4.9.3.0->4.10.0.0. This will ensure a simplified upgrade path as: 4.9.2.0->4.9.3.0->4.10.0.0.
  • In future, when we have 4.9.3.0, 4.9.3.0 users will have an upgrade path to 4.10.x.

Pinging for additional review/comments - @wido @DaanHoogland @abhinandanprateek and others

@yadvr
Copy link
Member Author

yadvr commented May 18, 2017

@blueorangutan package

@resmo
Copy link
Member

resmo commented May 18, 2017

LGTM

@yadvr yadvr force-pushed the 4930-upgradepath branch 2 times, most recently from 98e96bb to eed54e0 Compare May 19, 2017 10:51
@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-737

- Fix now() to utc timestamp

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr yadvr force-pushed the 4930-upgradepath branch from eed54e0 to 1cabd32 Compare May 19, 2017 11:21
@yadvr
Copy link
Member Author

yadvr commented May 19, 2017

@blueorangutan package

@yadvr
Copy link
Member Author

yadvr commented May 19, 2017

I'll be testing and fwd-merging this with the approach described yesterday. /cc @karuturi

@asfgit asfgit merged commit 1cabd32 into apache:4.9 May 19, 2017
asfgit pushed a commit that referenced this pull request May 19, 2017
CLOUDSTACK-9792: Add upgrade path for 4.9.3.0

This adds an upgrade path from 4.9.2.0 to 4.9.3.0, this also includes
changes from PR #1928 that adds missing hypervisor capability in
4.9/4.10+. This also fixes a db-cleanup path sequence issues, with that
puts 4.10 after 4.1.0, and before 4.2.0.

Once validated I can help merge this on master, since this will cause
merge conflicts on fwd-merging.

Ping - @syed @karuturi @borisstoyanov @DaanHoogland @abhinandanprateek

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants