-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Change the check for the existence of cryptsetup
command
#8482
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clgtm
@lucas-a-martins why did you close #8480 in favour of this PR? they seem to do the same.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8482 +/- ##
============================================
+ Coverage 30.74% 30.80% +0.05%
- Complexity 33930 33990 +60
============================================
Files 5341 5341
Lines 374918 374918
Branches 54534 54534
============================================
+ Hits 115286 115499 +213
+ Misses 244374 244151 -223
- Partials 15258 15268 +10
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code lgtm
@blueorangutan package |
@sureshanaparti 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code lgtm
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8263 |
@DaanHoogland thanks for your review. About the #8480, it was my first PR. I made some mistakes and didn't know how to fix them, so I thought it would be better just closing it and creating a new one, but now I know it was not a good decision. I will be more careful. |
no problem @lucas-a-martins and no harm done. Just wondering what happened. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I manually tested this patch in a local environment, LGTM.
2024-01-12 13:59:23,198 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:e1013b70) Executing command [cryptsetup --usage ].
2024-01-12 13:59:23,219 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:e1013b70) Successfully executed process [12069] for command [cryptsetup --usage ].
2024-01-12 13:59:23,220 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:e1013b70) Usage: cryptsetup [-?Vvyrq] [-?|--help] [--usage] [-V|--version]
[-v|--verbose] [--debug] [--debug-json] [-c|--cipher=STRING]
[-h|--hash=STRING] [-y|--verify-passphrase] [-d|--key-file=STRING]
--
2024-01-12 15:48:06,513 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:) Executing command [cryptsetup --version ].
2024-01-12 15:48:06,525 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:) Successfully executed process [15380] for command [cryptsetup --version ].
2024-01-12 15:48:06,527 DEBUG [utils.script.Script] (Agent-Handler-1:null) (logid:) cryptsetup 2.2.2
Merging this based on four approvals and manual test. |
Awesome work, congrats on your first merged pull request! |
Hm @BryanMLima , we were still in freeze. don't think it will be a problem though. cc @shwstppr . |
@DaanHoogland @shwstppr, my mistake, I can revert the merge commit if it is required. |
No need to revert, I think |
Hi guys, I think in case 4.19.0 RC4 makes it to be the final release this fix won't be on 4.19.1 as the milestone states, but will be present only on the future 4.20. @BryanMLima @shwstppr in case you are reverting this fix please target it to the 4.19 branch |
Good catch @nvazquez. If we want it in 4.19.1 I guess either we need to revert and merge again in 4.19 branch once 4.19 release is done or we would need to backport the commit. Any other suggestions @BryanMLima @DaanHoogland @weizhouapache ? |
We can backport to 4.18, then merge forward to 4.19 and main |
Co-authored-by: lucas.martins.scclouds <lucas.martins@scclouds.com.br>
@BryanMLima @lucas-a-martins , as @nvazquez said and hopefully it will be on 4.20 ;) but if you need it in a mainstream release before, please backport. |
@DaanHoogland |
Thanks, @weizhouapache! Sorry for any inconvenience guys, my mistake. I will pay more attention in the future. |
no worries @BryanMLima |
Co-authored-by: lucas.martins.scclouds <lucas.martins@scclouds.com.br>
Co-authored-by: lucas.martins.scclouds <lucas.martins@scclouds.com.br>
Description
Currently, when starting the Agent, ACS checks if the
cryptsetup
command can be used by using the command'shelp
; the output of the command is printed in the logs. However, this output is too verbose and can be confusing.This PR addresses this issue by using the utility version to check the command, instead of
help
, which is much less verbose.Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
I checked the logs before and after changes. As shown in the screenshots above, the logs became more intuitive.