Skip to content

engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0#4092

Merged
yadvr merged 4 commits intoapache:masterfrom
shapeblue:upgrade-path-415
May 27, 2020
Merged

engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0#4092
yadvr merged 4 commits intoapache:masterfrom
shapeblue:upgrade-path-415

Conversation

@shwstppr
Copy link
Contributor

@shwstppr shwstppr commented May 20, 2020 •
edited by yadvr
Loading

Description

Empty DB upgrade path from 4.14.0.0 to 4.15.0.0

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

@shwstppr
engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
3d99234 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@blueorangutan
Copy link

blueorangutan commented May 20, 2020

Packaging result: ✔centos7 ✔debian. JID-1235

@shwstppr
fix
d1daf94 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
DaanHoogland
DaanHoogland approved these changes May 21, 2020
View reviewed changes
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.

looks good, we have a rat issue due to other code that we need to fix for the checks to function again.

yadvr
yadvr reviewed May 26, 2020
View reviewed changes
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java
}

@SuppressWarnings("serial")
private void updateSystemVmTemplates(final Connection conn) {
Copy link
Member

@yadvr yadvr May 26, 2020

Choose a reason for hiding this comment

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

@shwstppr can you remove any similar check in the previous upgrade path 4.13->4.14 for example? We don't want multiple instances of systemvm migration code in older upgrade paths.

Copy link
Contributor Author

@shwstppr shwstppr May 26, 2020

Choose a reason for hiding this comment

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

@rhtyd removed the systemvm code from 41310to41400. Please confirm if it is fine now

@yadvr yadvr closed this May 26, 2020
@yadvr yadvr reopened this May 26, 2020
@yadvr
Copy link
Member

yadvr commented May 26, 2020

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented May 26, 2020

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

@blueorangutan
Copy link

blueorangutan commented May 26, 2020

Packaging result: ✔centos7 ✔debian. JID-1242

@DaanHoogland
Copy link
Contributor

DaanHoogland commented May 26, 2020

@blueorangutan test matrix

@blueorangutan
Copy link

blueorangutan commented May 26, 2020

@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware67, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

shwstppr added 2 commits May 26, 2020 20:41
@shwstppr
removed undesired systemvm code
a616d0c 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr
fix previous commit, remove systemvm code from earlier path
f972d9b 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@blueorangutan
Copy link

blueorangutan commented May 27, 2020

Trillian test result (tid-1569)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46575 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4092-t1569-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 78 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@yadvr yadvr marked this pull request as ready for review May 27, 2020 05:20
@yadvr yadvr merged commit d0d3465 into apache:master May 27, 2020
@yadvr yadvr deleted the upgrade-path-415 branch May 27, 2020 05:20
@yadvr yadvr added this to the 4.15.0.0 milestone May 27, 2020
@yadvr yadvr mentioned this pull request May 27, 2020
Merged
5 tasks
@DaanHoogland
Copy link
Contributor

DaanHoogland commented Jun 3, 2020

I am having second thoughts about this one @rhtyd @shwstppr ! we shouldn't have to install the 4.14 templates when upgrade from 4.14, should we? these should already be in place.

@yadvr
Copy link
Member

yadvr commented Jun 4, 2020

@DaanHoogland you're right I actually wanted that to be moved to 4.14-4.15 upgrade path so I can fix it in here - https://github.com/apache/cloudstack/pull/4104/files We'll have a new systemvmtemplate for 4.15 (Debian 10 based). It won't be problem if we merge #4104

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Jun 4, 2020

ok, @rhtyd that means we must give that one high priority as no update (addmittedly of dev envs only) will work

@PaulAngus PaulAngus mentioned this pull request Oct 26, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes

@DaanHoogland DaanHoogland DaanHoogland approved these changes

Assignees

No one assigned

Labels

type:new-feature

Projects

None yet

Milestone

4.15.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@shwstppr @blueorangutan @yadvr @DaanHoogland @ACSGitBot