Skip to content

Conversation

@sureshanaparti
Copy link
Contributor

Description

There is a regression in 4.20.1 & 4.20.2 which is resulting in the issue #8517.

This PR fixes the agent wait before reconnect, applies the fix in #9258 with minor log updates.

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?

Patched the agent changes to 4.20.2 env with 3 kvm hosts, and restarted agents in all the kvm hosts. Verfied the CPU util in MS.

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

weizhouapache and others added 2 commits November 27, 2025 14:56
* agent: reconnect after waiting 5 seconds

* Update agent/src/main/java/com/cloud/agent/Agent.java

* Update agent/src/main/java/com/cloud/agent/Agent.java

Co-authored-by: Suresh Kumar Anaparti <[email protected]>
@weizhouapache
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

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

@codecov
Copy link

codecov bot commented Nov 27, 2025

Codecov Report

❌ Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.17%. Comparing base (4dc3931) to head (d21aaa4).
⚠️ Report is 14 commits behind head on 4.20.

Files with missing lines Patch % Lines
agent/src/main/java/com/cloud/agent/Agent.java 0.00% 6 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.20   #12153      +/-   ##
============================================
- Coverage     16.18%   16.17%   -0.01%     
+ Complexity    13304    13298       -6     
============================================
  Files          5657     5657              
  Lines        498464   498475      +11     
  Branches      60491    60493       +2     
============================================
- Hits          80695    80649      -46     
- Misses       408787   408852      +65     
+ Partials       8982     8974       -8     
Flag Coverage Δ
uitests 4.00% <ø> (-0.01%) ⬇️
unittests 17.03% <0.00%> (-0.02%) ⬇️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@blueorangutan
Copy link

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

@sureshanaparti
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

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

@DaanHoogland DaanHoogland added this to the 4.20.3 milestone Nov 27, 2025
@blueorangutan
Copy link

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

Test Result Time (s) Test File

Copy link

@rajujith rajujith left a comment

Choose a reason for hiding this comment

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

LGTM
Tested , this resolved the issue. However I would suggest adding autoshutdown after a timeout , unconfigure the agent probably by moving the agent.properties to a backup file and stopping the agent on removal from management server as a separate improvement in future versions.

} else if (task.getType() == Task.Type.DISCONNECT) {
logger.debug("Executing disconnect task - {}", () -> getLinkLog(task.getLink()));
try {
// an issue has been found if reconnect immediately after disconnecting. please refer to https://github.com/apache/cloudstack/issues/8517
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// an issue has been found if reconnect immediately after disconnecting. please refer to https://github.com/apache/cloudstack/issues/8517
// an issue has been found if reconnect immediately after disconnecting.

I think we can refer a github issue in a PR but not in code. We may not be on github forever.

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.

5 participants