Skip to content

server: fix issue that vm guest os type is reset after updatetemplate #4377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
DaanHoogland merged 1 commit into from
Oct 15, 2020
Merged

server: fix issue that vm guest os type is reset after updatetemplate #4377

DaanHoogland merged 1 commit into from
Oct 15, 2020

Conversation

@ustcweizhou
Copy link
Contributor

@ustcweizhou ustcweizhou commented Oct 6, 2020

Description

Steps to reproduce the issue
(1) change vm guest os type
(2) update vm template (guest os type is not changed)
(3) vm guest os type is reset to guest os type of template.

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?

@ustcweizhou
server: fix issue that vm guest os type is reset after updatetemplate
c197546 
Steps to reproduce the issue
(1) change vm guest os type
(2) update vm template (guest os type is not changed)
(3) vm guest os type is reset to guest os type of template.
DaanHoogland
DaanHoogland approved these changes Oct 6, 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.

lgtm

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Oct 6, 2020

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Oct 6, 2020

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

@DaanHoogland DaanHoogland added this to the 4.14.1.0 milestone Oct 6, 2020
@blueorangutan
Copy link

blueorangutan commented Oct 6, 2020

Packaging result: ✔centos7 ✖centos8 ✖debian. JID-2128

@blueorangutan
Copy link

blueorangutan commented Oct 6, 2020

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-2135

@rohityadavcloud
Copy link
Member

rohityadavcloud commented Oct 14, 2020

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Oct 14, 2020

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

@blueorangutan
Copy link

blueorangutan commented Oct 14, 2020

Trillian test result (tid-2943)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31904 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4377-t2943-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_deploy_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_02_invalid_upgrade_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_03_deploy_and_upgrade_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_04_deploy_and_scale_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_06_deploy_invalid_kubernetes_ha_cluster Failure 0.01 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 0.01 test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster Failure 0.01 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.01 test_kubernetes_clusters.py

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Oct 15, 2020

@shwstppr i don't think these errors are relevant, can you comment? cc @rhtyd

sureshanaparti
sureshanaparti reviewed Oct 15, 2020
View reviewed changes
server/src/main/java/com/cloud/template/TemplateManagerImpl.java
ex.addProxyObject(String.valueOf(id), "templateId");
throw ex;
}
long oldGuestOSId = template.getGuestOSId();
Copy link
Contributor

@sureshanaparti sureshanaparti Oct 15, 2020

Choose a reason for hiding this comment

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

moving before this line L#2096 template = _tmpltDao.createForUpdate(id); should be ok?

@shwstppr
Copy link
Contributor

shwstppr commented Oct 15, 2020

k8s smoke test failure is env related. It failed to get ISO in ready state cc @DaanHoogland

shwstppr
shwstppr approved these changes Oct 15, 2020
View reviewed changes
Copy link
Contributor

@shwstppr shwstppr left a comment

Choose a reason for hiding this comment

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

LGTM

@DaanHoogland DaanHoogland merged commit f7a3701 into apache:4.14 Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sureshanaparti sureshanaparti sureshanaparti left review comments

@shwstppr shwstppr shwstppr approved these changes

@DaanHoogland DaanHoogland DaanHoogland approved these changes

Assignees

No one assigned

Labels

Severity:Minor type:bug

Projects

None yet

Milestone

4.14.1.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ustcweizhou @DaanHoogland @blueorangutan @rohityadavcloud @shwstppr @sureshanaparti