Skip to content

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

Merged
DaanHoogland merged 1 commit intoapache:4.19from
weizhouapache:4.19-fix-keystore-patch-systemvm
Jan 13, 2025
Merged

systemvm: fix keystore is reset when patch a systemvm#9900
DaanHoogland merged 1 commit intoapache:4.19from
weizhouapache:4.19-fix-keystore-patch-systemvm

Conversation

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache commented Nov 6, 2024

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

@weizhouapache 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
@codecov
Copy link
Copy Markdown

codecov bot commented Nov 6, 2024 •
edited
Loading

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.

@yadvr yadvr added this to the 4.19.2.0 milestone Nov 7, 2024
@yadvr yadvr requested review from Pearl1594 and shwstppr November 7, 2024 09:12
@weizhouapache weizhouapache marked this pull request as ready for review November 7, 2024 10:08
@weizhouapache
Copy link
Copy Markdown
Member Author

weizhouapache commented Nov 7, 2024

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 7, 2024

@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
Copy link
Copy Markdown

blueorangutan commented Nov 7, 2024

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

Pearl1594
Pearl1594 approved these changes Nov 29, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@Pearl1594 Pearl1594 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

@vladimirpetrov vladimirpetrov removed their assignment Dec 11, 2024
winterhazel
winterhazel approved these changes Jan 12, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@winterhazel winterhazel left a comment

Choose a reason for hiding this comment

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

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

@DaanHoogland DaanHoogland merged commit 35fe19f into apache:4.19 Jan 13, 2025
@DaanHoogland DaanHoogland deleted the 4.19-fix-keystore-patch-systemvm branch January 13, 2025 08:40
@DaanHoogland DaanHoogland mentioned this pull request Jan 13, 2025
Closed
DaanHoogland added a commit that referenced this pull request Jan 13, 2025
@DaanHoogland
Merge release branch 4.20 to main
bd874ea 
* 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)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 16, 2025
@weizhouapache @dhslove
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
@weizhouapache
systemvm: fix keystore is reset when patch a systemvm (apache#9900)
b220910
weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Jun 5, 2025
@weizhouapache
systemvm: fix failed to get script version when patch system vm or ro…
b76445e 
…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"}}] }
```
@weizhouapache weizhouapache mentioned this pull request Jun 5, 2025
Merged
14 tasks
@kiranchavala kiranchavala mentioned this pull request Jul 1, 2025
Closed
weizhouapache added a commit that referenced this pull request Sep 26, 2025
@weizhouapache
systemvm: fix failed to get script version when patch system vm or ro…
5dfeb79 
…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"}}] }
```
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Oct 17, 2025
@weizhouapache @dhslove
systemvm: fix failed to get script version when patch system vm or ro…
43b0978 
…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"}}] }
```
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

@Pearl1594 Pearl1594 Pearl1594 approved these changes

@sureshanaparti sureshanaparti sureshanaparti approved these changes

@winterhazel winterhazel winterhazel approved these changes

@shwstppr shwstppr Awaiting requested review from shwstppr

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.19.2

Development

Successfully merging this pull request may close these issues.

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

8 participants

@weizhouapache @blueorangutan @yadvr @Pearl1594 @sureshanaparti @winterhazel @DaanHoogland @vladimirpetrov