Skip to content
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

[KVM] Add watchdog model none to disable use of watchdogs on KVM agent #10203

Merged
merged 2 commits into from
Jan 23, 2025

Conversation

nvazquez
Copy link
Contributor

@nvazquez nvazquez commented Jan 18, 2025

Description

This PR allows the value none for the property vm.watchdog.model on the agent.properties file. When value is set to none then no watchdogs are created for the VM deployments

For EL9 hosts on ARM64: VM deployments fail with error:

2025-01-17T23:31:51.072699Z qemu-kvm: -device {"driver":"i6300esb","id":"watchdog0","bus":"pci.8","addr":"0x1"}: 'i6300esb' is not a valid device model name

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?

@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@nvazquez 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.

Copy link

codecov bot commented Jan 18, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.14%. Comparing base (96b757c) to head (32fa184).
Report is 1 commits behind head on 4.20.

Additional details and impacted files
@@            Coverage Diff            @@
##               4.20   #10203   +/-   ##
=========================================
  Coverage     16.13%   16.14%           
- Complexity    12972    12973    +1     
=========================================
  Files          5639     5639           
  Lines        494297   494299    +2     
  Branches      59908    59909    +1     
=========================================
+ Hits          79773    79789   +16     
+ Misses       405698   405684   -14     
  Partials       8826     8826           
Flag Coverage Δ
uitests 4.02% <ø> (ø)
unittests 16.99% <100.00%> (+<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.

@blueorangutan
Copy link

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

Copy link

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

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

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 12118

@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

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

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

Copy link

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@nvazquez nvazquez changed the title [KVM] Exclude watchdogs for ARM64 VM deployments [KVM] Add watchdog model none to disable use of watchdogs on KVM agent Jan 20, 2025
@nvazquez nvazquez marked this pull request as ready for review January 22, 2025 00:57
@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@nvazquez 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.

Copy link
Contributor

@NuxRo NuxRo left a comment

Choose a reason for hiding this comment

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

LGTM based on hands-on testing

@blueorangutan
Copy link

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

@nvazquez
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

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

@apache apache deleted a comment from blueorangutan Jan 22, 2025
@blueorangutan
Copy link

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

Test Result Time (s) Test File
test_11_isolated_network_with_dynamic_routed_mode Error 1.25 test_ipv4_routing.py
test_12_vpc_and_tier_with_dynamic_routed_mode Error 2.37 test_ipv4_routing.py
test_12_vpc_and_tier_with_dynamic_routed_mode Error 2.37 test_ipv4_routing.py

Copy link
Member

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

minor advise: can you update agent.properties as well ?

# The model of Watchdog timer to present to the Guest.
# For all models refer to the libvirt documentation.
#vm.watchdog.model=i6300esb

@nvazquez
Copy link
Contributor Author

Thanks @weizhouapache, added it now

@DaanHoogland DaanHoogland added this to the 4.20.1 milestone Jan 23, 2025
@DaanHoogland DaanHoogland merged commit 7e295ec into apache:4.20 Jan 23, 2025
26 checks passed
@DaanHoogland DaanHoogland deleted the fix-arm-watchdog branch January 23, 2025 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants