[KVM] Add watchdog model none to disable use of watchdogs on KVM agent by nvazquez · Pull Request #10203 · apache/cloudstack

nvazquez · 2025-01-18T02:48:19Z

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

Screenshots (if appropriate):

How Has This Been Tested?

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

nvazquez · 2025-01-18T02:51:29Z

@blueorangutan package

blueorangutan · 2025-01-18T02:52:03Z

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

codecov · 2025-01-18T02:56:04Z

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 · 2025-01-18T04:05:36Z

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

github-actions · 2025-01-20T00:04:19Z

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

nvazquez · 2025-01-20T00:14:47Z

@blueorangutan package

blueorangutan · 2025-01-20T00:16:03Z

@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 · 2025-01-20T00:17:24Z

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

nvazquez · 2025-01-20T00:41:37Z

@blueorangutan package

blueorangutan · 2025-01-20T00:42:04Z

@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 · 2025-01-20T01:48:33Z

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

github-actions · 2025-01-20T11:28:56Z

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

nvazquez · 2025-01-22T00:57:41Z

@blueorangutan package

blueorangutan · 2025-01-22T01:00:04Z

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

NuxRo

LGTM based on hands-on testing

blueorangutan · 2025-01-22T02:04:36Z

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

nvazquez · 2025-01-22T02:08:05Z

@blueorangutan test

blueorangutan · 2025-01-22T02:10:04Z

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

blueorangutan · 2025-01-22T23:34:53Z

[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

weizhouapache

code lgtm

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

cloudstack/agent/conf/agent.properties

Lines 287 to 289 in 81e052c

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

nvazquez · 2025-01-23T11:19:26Z

Thanks @weizhouapache, added it now

apache#10203)

boring-cyborg Bot added component:agent component:kvm labels Jan 18, 2025

nvazquez force-pushed the fix-arm-watchdog branch from 02e8c8b to 4a705f1 Compare January 20, 2025 00:04

boring-cyborg Bot added the component:packaging label Jan 20, 2025

github-actions Bot added the status:has-conflicts label Jan 20, 2025

github-actions Bot removed the status:has-conflicts label Jan 20, 2025

nvazquez force-pushed the fix-arm-watchdog branch from 6028284 to b6c7ab7 Compare January 20, 2025 11:14

github-actions Bot added the status:has-conflicts label Jan 20, 2025

nvazquez force-pushed the fix-arm-watchdog branch from b6c7ab7 to b31dc96 Compare January 20, 2025 13:41

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

github-actions Bot removed the status:has-conflicts label Jan 22, 2025

Add watchdog model none to disable use of watchdogs on KVM agent

d3eace2

nvazquez force-pushed the fix-arm-watchdog branch from 1b43424 to d3eace2 Compare January 22, 2025 00:56

nvazquez marked this pull request as ready for review January 22, 2025 00:57

nvazquez requested review from DaanHoogland, NuxRo, shwstppr and yadvr January 22, 2025 00:57

nvazquez requested review from Pearl1594, harikrishna-patnala, sureshanaparti and weizhouapache January 22, 2025 00:57

NuxRo approved these changes Jan 22, 2025

View reviewed changes

yadvr approved these changes Jan 22, 2025

View reviewed changes

apache deleted a comment from blueorangutan Jan 22, 2025

weizhouapache approved these changes Jan 23, 2025

View reviewed changes

Add none model line to conf/agent.properties

32fa184

DaanHoogland added this to the 4.20.1 milestone Jan 23, 2025

DaanHoogland merged commit 7e295ec into apache:4.20 Jan 23, 2025

DaanHoogland deleted the fix-arm-watchdog branch January 23, 2025 12:15

Pearl1594 added this to ACS 4.20.1 Mar 17, 2025

Pearl1594 moved this to Done in ACS 4.20.1 Mar 17, 2025

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

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

1d0cfce

apache#10203)

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

Uh oh!

Conversation

nvazquez commented Jan 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

nvazquez commented Jan 18, 2025

Uh oh!

blueorangutan commented Jan 18, 2025

Uh oh!

codecov Bot commented Jan 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jan 18, 2025

Uh oh!

github-actions Bot commented Jan 20, 2025

Uh oh!

nvazquez commented Jan 20, 2025

Uh oh!

blueorangutan commented Jan 20, 2025

Uh oh!

blueorangutan commented Jan 20, 2025

Uh oh!

nvazquez commented Jan 20, 2025

Uh oh!

blueorangutan commented Jan 20, 2025

Uh oh!

blueorangutan commented Jan 20, 2025

Uh oh!

github-actions Bot commented Jan 20, 2025

Uh oh!

nvazquez commented Jan 22, 2025

Uh oh!

blueorangutan commented Jan 22, 2025

Uh oh!

NuxRo left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Jan 22, 2025

Uh oh!

nvazquez commented Jan 22, 2025

Uh oh!

blueorangutan commented Jan 22, 2025

Uh oh!

blueorangutan commented Jan 22, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Jan 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

nvazquez commented Jan 18, 2025 •

edited

Loading

codecov Bot commented Jan 18, 2025 •

edited

Loading