systemvm: fix keystore is reset when patch a systemvm #9900

weizhouapache · 2024-11-06T15:38:40Z

Description

This PR fixes #9086

Steps to reproduce the issue

create an env
check certs in SSVM
keytool -list -keystore /usr/local/cloud/systemvm/certs/realhostip.keystore -storepass vmops.com |grep entries
upgrade the env, and then patch the SSVM
OR, patch the SSVM forcely
check certs in SSVM again
keytool -list -keystore /usr/local/cloud/systemvm/certs/realhostip.keystore -storepass vmops.com |grep entries

expect results

the certs are imported

actual results

the keystore contains only 4 certs after patching

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)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2024-11-06T15:47:54Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 15.10%. Comparing base (a6cef7a) to head (42ca8ed).
Report is 62 commits behind head on 4.19.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19    #9900      +/-   ##
============================================
- Coverage     15.11%   15.10%   -0.01%     
+ Complexity    11217    11213       -4     
============================================
  Files          5404     5404              
  Lines        473426   473426              
  Branches      60681    59665    -1016     
============================================
- Hits          71539    71523      -16     
- Misses       393891   393909      +18     
+ Partials       7996     7994       -2

Flag	Coverage Δ
uitests	`4.30% <ø> (ø)`
unittests	`15.82% <ø> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

weizhouapache · 2024-11-07T10:08:53Z

@blueorangutan package

blueorangutan · 2024-11-07T10:10:03Z

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-11-07T11:03:55Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11522

Pearl1594

code LGTM

winterhazel

Tested by upgrading an environment, patching the system VM and verifying the keystore.

* 4.20: systemvm: fix keystore is reset when patch a systemvm (#9900) no retrieval of null hosts (#10175) upgrade: consider multiple hypervisors and secondary storages (#10046) CheckOnHostCommand: add missing timeout setting (#9677)

…uter This is a regression of apache#9900 prior to this PR ``` 2025-06-05 12:28:53,992 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:29:25,959 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:29:25,961 WARN [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Failed to get the latest script version 2025-06-05 12:29:25,962 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Seq 2-7450361158554357406: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb ``` with this PR ``` 2025-06-05 12:42:46,219 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Request:Seq 2-7450361158554357463: { Cmd , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 100011, [{"com.cloud.agent.api.PatchSystemVmCommand":{"forced":"true","accessDetails":{"router.ip":"169.254.151.188","router.name":"s-368-VM"},"wait":"0","bypassHostMaintenance":"false"}}] } 2025-06-05 12:42:46,220 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:43:18,083 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-2:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:43:18,083 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Seq 2-7450361158554357463: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb","result":"true","details":"Successfully patched systemVM s-368-VM ","wait":"0","bypassHostMaintenance":"false"}}] } ```

…uter (#10962) This is a regression of #9900 prior to this PR ``` 2025-06-05 12:28:53,992 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:29:25,959 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:29:25,961 WARN [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Failed to get the latest script version 2025-06-05 12:29:25,962 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Seq 2-7450361158554357406: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb ``` with this PR ``` 2025-06-05 12:42:46,219 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Request:Seq 2-7450361158554357463: { Cmd , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 100011, [{"com.cloud.agent.api.PatchSystemVmCommand":{"forced":"true","accessDetails":{"router.ip":"169.254.151.188","router.name":"s-368-VM"},"wait":"0","bypassHostMaintenance":"false"}}] } 2025-06-05 12:42:46,220 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:43:18,083 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-2:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:43:18,083 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Seq 2-7450361158554357463: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb","result":"true","details":"Successfully patched systemVM s-368-VM ","wait":"0","bypassHostMaintenance":"false"}}] } ```

…uter (apache#10962) This is a regression of apache#9900 prior to this PR ``` 2025-06-05 12:28:53,992 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:29:25,959 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:29:25,961 WARN [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-1:[]) (logid:) Failed to get the latest script version 2025-06-05 12:29:25,962 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-1:[]) (logid:) Seq 2-7450361158554357406: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb ``` with this PR ``` 2025-06-05 12:42:46,219 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Request:Seq 2-7450361158554357463: { Cmd , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 100011, [{"com.cloud.agent.api.PatchSystemVmCommand":{"forced":"true","accessDetails":{"router.ip":"169.254.151.188","router.name":"s-368-VM"},"wait":"0","bypassHostMaintenance":"false"}}] } 2025-06-05 12:42:46,220 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Processing command: com.cloud.agent.api.PatchSystemVmCommand 2025-06-05 12:43:18,083 DEBUG [resource.wrapper.LibvirtPatchSystemVmCommandWrapper] (AgentRequest-Handler-2:[]) (logid:) Patch result of systemVM s-368-VM: /root 2025-06-05 12:43:18,083 DEBUG [cloud.agent.Agent] (AgentRequest-Handler-2:[]) (logid:) Seq 2-7450361158554357463: { Ans: , MgmtId: 32986204472275, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.PatchSystemVmAnswer":{"templateVersion":"Cloudstack Release 4.20.1 Wed May 14 05:22:13 PM UTC 2025","scriptsVersion":"5ebc6ded1a3880732363c1cdbbd54cfb","result":"true","details":"Successfully patched systemVM s-368-VM ","wait":"0","bypassHostMaintenance":"false"}}] } ```

systemvm: fix keystore is reset when patch a systemvm

42ca8ed

weizhouapache linked an issue Nov 6, 2024 that may be closed by this pull request

Certificate error when downloading ISO (keystore not set up correctly) #9086

Closed

rohityadavcloud approved these changes Nov 7, 2024

View reviewed changes

rohityadavcloud added this to the 4.19.2.0 milestone Nov 7, 2024

rohityadavcloud requested review from Pearl1594 and shwstppr November 7, 2024 09:12

weizhouapache marked this pull request as ready for review November 7, 2024 10:08

DaanHoogland added status:testing status:needs-testing and removed status:testing labels Nov 8, 2024

DaanHoogland assigned vladimirpetrov Nov 12, 2024

sureshanaparti approved these changes Nov 29, 2024

View reviewed changes

Pearl1594 approved these changes Nov 29, 2024

View reviewed changes

vladimirpetrov removed their assignment Dec 11, 2024

winterhazel approved these changes Jan 12, 2025

View reviewed changes

DaanHoogland removed the status:needs-testing label Jan 13, 2025

DaanHoogland merged commit 35fe19f into apache:4.19 Jan 13, 2025
25 checks passed

DaanHoogland deleted the 4.19-fix-keystore-patch-systemvm branch January 13, 2025 08:40

DaanHoogland mentioned this pull request Jan 13, 2025

Certificate error when downloading ISO (keystore not set up correctly) #9086

Closed

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 16, 2025

systemvm: fix keystore is reset when patch a systemvm (apache#9900)

d9ce538

rg9975 pushed a commit to rg9975/cloudstack that referenced this pull request Jan 31, 2025

systemvm: fix keystore is reset when patch a systemvm (apache#9900)

b220910

weizhouapache mentioned this pull request Jun 5, 2025

systemvm: fix failed to get script version when patch system vm or router #10962

Merged

14 tasks

kiranchavala mentioned this pull request Jul 1, 2025

Unable to register a cloud image template with direct download option enabled #11112

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

systemvm: fix keystore is reset when patch a systemvm #9900

systemvm: fix keystore is reset when patch a systemvm #9900

Uh oh!

weizhouapache commented Nov 6, 2024

Uh oh!

codecov bot commented Nov 6, 2024 •

edited

Loading

Uh oh!

weizhouapache commented Nov 7, 2024

Uh oh!

blueorangutan commented Nov 7, 2024

Uh oh!

blueorangutan commented Nov 7, 2024

Uh oh!

Pearl1594 left a comment

Uh oh!

winterhazel left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

systemvm: fix keystore is reset when patch a systemvm #9900

systemvm: fix keystore is reset when patch a systemvm #9900

Uh oh!

Conversation

weizhouapache commented Nov 6, 2024

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Nov 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Nov 7, 2024

Uh oh!

blueorangutan commented Nov 7, 2024

Uh oh!

blueorangutan commented Nov 7, 2024

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

winterhazel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented Nov 6, 2024 •

edited

Loading