Skip to content

Conversation

@GabrielBrascher
Copy link
Member

@GabrielBrascher GabrielBrascher commented Nov 1, 2019

Description

Fixes: #3655

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)

Error(false, "VM is in error"),
Unknown(false, "VM state is unknown."),
Shutdowned(false, "VM is shutdowned from inside");
Shutdown(false, "VM is shutdown from inside");
Copy link
Member

Choose a reason for hiding this comment

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

@GabrielBrascher Add database upgrade path to update any VMs in the old state to the new state name. (just a rare edge case).

Copy link
Member Author

Choose a reason for hiding this comment

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

@rhtyd added a database upgrade schema from 4.13.0.0 to 4.13.1.0 upgrading VMs from state Shutdowned to Shutdown.

Copy link
Member Author

Choose a reason for hiding this comment

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

@rhtyd does it look like a 4.13.1 fix? I had mapped it to 4.13.1.0, but I can target it to master/4.14.0.0; not really a bug fix, more likely an enhancement.

@GabrielBrascher GabrielBrascher force-pushed the typo-fix-shutdowned branch 4 times, most recently from df067a3 to 9e2fa49 Compare November 14, 2019 13:18
Copy link
Contributor

@wido wido left a comment

Choose a reason for hiding this comment

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

Code LGTM

@GabrielBrascher
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@GabrielBrascher 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-397

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.

I do approve of this change with one caveat:
If the state is used in automation by parsing logs or alerts this automation will break. I would like to see a small upgrade guide entry for that.

@GabrielBrascher
Copy link
Member Author

GabrielBrascher commented Nov 28, 2019

@DaanHoogland Makes sense adding it to the upgrade guide.

@GabrielBrascher
Copy link
Member Author

@rhtyd are you ok with this PR? Database upgrade has been covered.

@rohityadavcloud
Copy link
Member

Hi @GabrielBrascher let me review this and get back to you soon

@rohityadavcloud rohityadavcloud changed the base branch from 4.13 to master December 7, 2019 22:28
@rohityadavcloud rohityadavcloud modified the milestones: 4.13.1.0, 4.14.0.0 Dec 7, 2019
@rohityadavcloud
Copy link
Member

This could be considered major change @GabrielBrascher - can you move this to 4.13->4.14 upgrade path on master?

@GabrielBrascher
Copy link
Member Author

No problem @rhtyd, I will move it to 4.14

@GabrielBrascher
Copy link
Member Author

@rhtyd code has been updated, ported to master and added SQL UPDATE into schema-41300to41400.sql.

@GabrielBrascher
Copy link
Member Author

Fixed conflict on schema-41300to41400.sql; now the branch has no conflicts with the master branch.

@GabrielBrascher
Copy link
Member Author

@andrijapanicsb this one looks like a simple "fix" and has 2 LGTMs aiming it for 4.14. Can you please take a look?

@rhtyd thanks for the review, are you ok with the code the way that it is after updating the upgrade path?

@andrijapanicsb
Copy link
Contributor

andrijapanicsb commented Jan 3, 2020

Looks OK @GabrielBrascher and the schema update path as well.

@andrijapanicsb
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@andrijapanicsb 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-525

@andrijapanicsb
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@andrijapanicsb
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-693)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 28374 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3659-t693-kvm-centos7.zip
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@andrijapanicsb
Copy link
Contributor

Let there be grammar!

@andrijapanicsb andrijapanicsb merged commit d8a2f5d into apache:master Jan 13, 2020
@apache apache deleted a comment from blueorangutan Jan 13, 2020
Spaceman1984 pushed a commit to shapeblue/cloudstack that referenced this pull request Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Typo in VM State

7 participants