kvm: fix error when enable SSL for kvm agent #7923

weizhouapache · 2023-08-30T11:46:49Z

Description

This PR fixes the error: 'Failed to find passphrase for keystore: cloud.jks'

This was implemented in PR #6200 and #6371 , but broken in PR #6348.
The issue has been fixed in PR #7693, not sure if this change is required or not

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

weizhouapache · 2023-08-30T11:48:15Z

@blueorangutan package

blueorangutan · 2023-08-30T11:50:04Z

@weizhouapache a [SF] 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.

GutoVeronezi · 2023-08-30T11:58:05Z

@weizhouapache could describe the steps to reproducee the error?

blueorangutan · 2023-08-30T12:42:12Z

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

codecov · 2023-08-30T12:43:39Z

Codecov Report

Merging #7923 (26702b8) into 4.18 (0b3438b) will decrease coverage by 0.01%.
Report is 4 commits behind head on 4.18.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.18    #7923      +/-   ##
============================================
- Coverage     13.07%   13.06%   -0.01%     
+ Complexity     9110     9108       -2     
============================================
  Files          2720     2720              
  Lines        257526   257533       +7     
  Branches      40150    40150              
============================================
- Hits          33661    33656       -5     
- Misses       219636   219649      +13     
+ Partials       4229     4228       -1

Files	Coverage Δ
...oud/hypervisor/vmware/resource/VmwareResource.java	`4.48% <0.00%> (ø)`
...ervisor/kvm/resource/LibvirtComputingResource.java	`18.45% <0.00%> (ø)`
.../hypervisor/kvm/storage/LinstorStorageAdaptor.java	`0.00% <0.00%> (ø)`

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2023-08-30T14:33:47Z

@weizhouapache could describe the steps to reproducee the error?

@GutoVeronezi
you can search "cloud.jks" in agent.log on any 4.18.0.0 kvm host. for example,

2023-08-30 12:56:33,603 INFO  [kvm.resource.LibvirtComputingResource] (main:null) (logid:) Failed to find passphrase for keystore: cloud.jks

rohityadavcloud

LGTM

rohityadavcloud · 2023-08-30T15:43:38Z

@weizhouapache is that a critical/blocker issue for 4.18.1, could env loose the passphrase key from agent.properties on usage or upgrade?

@blueorangutan test

blueorangutan · 2023-08-30T15:44:03Z

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

weizhouapache · 2023-08-30T16:21:35Z

@weizhouapache is that a critical/blocker issue for 4.18.1, could env loose the passphrase key from agent.properties on usage or upgrade?

@blueorangutan test

@rohityadavcloud
not critical I think, the keystore passphrase is saved in agent.properties without issue.
the issue is, the URL check of direct-download templates may fail

blueorangutan · 2023-08-31T04:54:32Z

[SF] Trillian test result (tid-7608)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45992 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7923-t7608-kvm-centos7.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_upgrade_kubernetes_cluster	`Failure`	558.50	test_kubernetes_clusters.py

weizhouapache · 2023-08-31T06:27:10Z

@blueorangutan test rocky8 kvm-rocky8

blueorangutan · 2023-08-31T06:28:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + kvm-rocky8) has been kicked to run smoke tests

weizhouapache · 2023-08-31T06:40:08Z

@blueorangutan test ubuntu22 kvm-ubuntu22

blueorangutan · 2023-08-31T06:42:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (ubuntu22 mgmt + kvm-ubuntu22) has been kicked to run smoke tests

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

DaanHoogland

clgtm

weizhouapache · 2023-08-31T10:39:27Z

The URL check issue has been fixed by #7693 in another way

I am not sure if this PR will break the feature. let's NOT merge it into 4.18.1.0

cc @rohityadavcloud @DaanHoogland @nvazquez

GutoVeronezi · 2023-08-31T12:29:07Z

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -1319,13 +1319,13 @@ protected void setupMemoryBalloonStatsPeriod(Connect conn) {
        }
    }

-    private void enableSSLForKvmAgent(final Map<String, Object> params) {
+    private void enableSSLForKvmAgent() {


We could have some unit tests for this method.

blueorangutan · 2023-08-31T18:28:14Z

[SF] Trillian test result (tid-7611)
Environment: kvm-rocky8 (x2), Advanced Networking with Mgmt server r8
Total time taken: 41113 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7923-t7611-kvm-rocky8.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2023-10-06T02:28:01Z

[SF] Trillian test result (tid-7860)
Environment: kvm-rocky8 (x2), Advanced Networking with Mgmt server r8
Total time taken: 44760 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7923-t7860-kvm-rocky8.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland · 2023-10-06T07:39:17Z

@weizhouapache is this covoured by any tests?

weizhouapache · 2023-10-06T07:57:48Z

@weizhouapache is this covoured by any tests?

@DaanHoogland no...

shwstppr · 2023-10-17T11:22:47Z

@weizhouapache is this ready for review/testing or more work is needed?

…en enable SSL for kvm agent This was implemented in PR#6200 and apache#6371 , but broken in PR#6348

DaanHoogland · 2023-10-18T08:17:26Z

@weizhouapache is this ready for review/testing or more work is needed?

@harikrishna-patnala , it needs some test(ing) i would put it on my list save the number of PRs on there. We could do with manual testing for now.

vladimirpetrov · 2023-10-18T09:06:49Z

@blueorangutan package

blueorangutan · 2023-10-18T09:08:03Z

@vladimirpetrov a [SF] 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 · 2023-10-18T10:06:53Z

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

vladimirpetrov

LGTM based on manual testing. Uploaded a new download certificate, registered a new HTTPS template, no cloud.jks failures in agents' logs.

DaanHoogland · 2023-10-20T09:33:43Z

@weizhouapache is this ready now? see also #7923 (comment), will you add to that (in this PR)?

weizhouapache · 2023-10-20T09:38:16Z

@weizhouapache is this ready now? see also #7923 (comment), will you add to that (in this PR)?

@DaanHoogland
sorry no, I am not going to do it

DaanHoogland · 2023-10-20T10:36:29Z

@weizhouapache is this ready now? see also #7923 (comment), will you add to that (in this PR)?

@DaanHoogland sorry no, I am not going to do it

ok, as @vladimirpetrov tested manually I gues we can merge this, right?

weizhouapache · 2023-12-06T08:54:39Z

@weizhouapache is this ready now? see also #7923 (comment), will you add to that (in this PR)?

@DaanHoogland sorry no, I am not going to do it

ok, as @vladimirpetrov tested manually I gues we can merge this, right?

@DaanHoogland @shwstppr
if there is no objection, let's merge this ?

shwstppr · 2023-12-06T09:00:36Z

@blueorangutan package

blueorangutan · 2023-12-06T09:02:03Z

@shwstppr 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 · 2023-12-06T10:02:13Z

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

DaanHoogland · 2023-12-06T13:32:39Z

@blueorangutan test

blueorangutan · 2023-12-06T13:34:03Z

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

blueorangutan · 2023-12-07T01:46:34Z

[SF] Trillian test result (tid-8485)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42393 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7923-t8485-kvm-centos7.zip
Smoke tests completed. 109 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

…en enable SSL for kvm agent (apache#7923)

boring-cyborg bot added component:agent component:kvm labels Aug 30, 2023

weizhouapache added this to the 4.18.2.0 milestone Aug 30, 2023

rohityadavcloud approved these changes Aug 30, 2023

View reviewed changes

apache deleted a comment from blueorangutan Aug 30, 2023

weizhouapache modified the milestones: 4.18.2.0, 4.18.1.0 Aug 31, 2023

rohityadavcloud requested a review from DaanHoogland August 31, 2023 06:48

DaanHoogland reviewed Aug 31, 2023

View reviewed changes

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java Show resolved Hide resolved

DaanHoogland approved these changes Aug 31, 2023

View reviewed changes

This was referenced Aug 31, 2023

Fix direct download URL checks #7693

Merged

Failed to register direct-download template in 4.18.1.0-RC1 #7929

Closed

GutoVeronezi reviewed Aug 31, 2023

View reviewed changes

weizhouapache removed this from the 4.18.1.0 milestone Aug 31, 2023

weizhouapache marked this pull request as draft October 6, 2023 08:37

DaanHoogland modified the milestones: 4.18.2.0, unplanned Oct 6, 2023

kvm: fix error 'Failed to find passphrase for keystore: cloud.jks' wh…

26702b8

…en enable SSL for kvm agent This was implemented in PR#6200 and apache#6371 , but broken in PR#6348

DaanHoogland force-pushed the 4.18-fix-kvm-agent-ssl branch from 5f312b2 to 26702b8 Compare October 18, 2023 08:16

DaanHoogland assigned vladimirpetrov Oct 18, 2023

vladimirpetrov approved these changes Oct 19, 2023

View reviewed changes

weizhouapache marked this pull request as ready for review December 6, 2023 08:54

DaanHoogland merged commit 7ea068c into apache:4.18 Dec 7, 2023
25 of 27 checks passed

DaanHoogland deleted the 4.18-fix-kvm-agent-ssl branch December 7, 2023 08:10

weizhouapache mentioned this pull request Dec 8, 2023

cannot add new host to cluster #8310

Closed

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Dec 11, 2023

kvm: fix error 'Failed to find passphrase for keystore: cloud.jks' wh…

20d5ee3

…en enable SSL for kvm agent (apache#7923)

kvm: fix error when enable SSL for kvm agent #7923

kvm: fix error when enable SSL for kvm agent #7923

Conversation

weizhouapache commented Aug 30, 2023 • edited

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

weizhouapache commented Aug 30, 2023

blueorangutan commented Aug 30, 2023

GutoVeronezi commented Aug 30, 2023

blueorangutan commented Aug 30, 2023

codecov bot commented Aug 30, 2023 • edited

Codecov Report

weizhouapache commented Aug 30, 2023

rohityadavcloud left a comment

Choose a reason for hiding this comment

rohityadavcloud commented Aug 30, 2023

blueorangutan commented Aug 30, 2023

weizhouapache commented Aug 30, 2023

blueorangutan commented Aug 31, 2023

weizhouapache commented Aug 31, 2023

blueorangutan commented Aug 31, 2023

weizhouapache commented Aug 31, 2023

blueorangutan commented Aug 31, 2023

DaanHoogland left a comment

Choose a reason for hiding this comment

weizhouapache commented Aug 31, 2023

GutoVeronezi Aug 31, 2023

Choose a reason for hiding this comment

blueorangutan commented Aug 31, 2023

blueorangutan commented Oct 6, 2023

DaanHoogland commented Oct 6, 2023

weizhouapache commented Oct 6, 2023

shwstppr commented Oct 17, 2023

DaanHoogland commented Oct 18, 2023

vladimirpetrov commented Oct 18, 2023

blueorangutan commented Oct 18, 2023

blueorangutan commented Oct 18, 2023

vladimirpetrov left a comment

Choose a reason for hiding this comment

DaanHoogland commented Oct 20, 2023

weizhouapache commented Oct 20, 2023

DaanHoogland commented Oct 20, 2023

weizhouapache commented Dec 6, 2023

shwstppr commented Dec 6, 2023

blueorangutan commented Dec 6, 2023

blueorangutan commented Dec 6, 2023

DaanHoogland commented Dec 6, 2023

blueorangutan commented Dec 6, 2023

blueorangutan commented Dec 7, 2023

weizhouapache commented Aug 30, 2023 •

edited

codecov bot commented Aug 30, 2023 •

edited