Skip to content

Conversation

Pearl1594
Copy link
Contributor

Description

This PR fixes: #8165

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?

@Pearl1594 Pearl1594 changed the title Veeam: Use restore timeout as a time interval as opposed to a counter Veeam: Use restore timeout as an interval as opposed to a counter Oct 1, 2025
Copy link

codecov bot commented Oct 1, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.87%. Comparing base (cd12fa5) to head (78a4b9a).
⚠️ Report is 36 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #11772      +/-   ##
============================================
+ Coverage     17.50%   17.87%   +0.37%     
- Complexity    15425    16036     +611     
============================================
  Files          5894     5899       +5     
  Lines        526877   545432   +18555     
  Branches      64337    72356    +8019     
============================================
+ Hits          92232    97509    +5277     
- Misses       424269   437062   +12793     
- Partials      10376    10861     +485     
Flag Coverage Δ
uitests 3.61% <ø> (+<0.01%) ⬆️
unittests 18.93% <100.00%> (+0.37%) ⬆️

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.

@harikrishna-patnala harikrishna-patnala added this to the 4.22.0 milestone Oct 2, 2025
@DaanHoogland DaanHoogland reopened this Oct 3, 2025
@DaanHoogland
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@DaanHoogland 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 15271

@DaanHoogland
Copy link
Contributor

seems like the unit test needs an update as well:

https://github.com/apache/cloudstack/actions/runs/18215826235/job/51864745203?pr=11772#step:7:22893

@Pearl1594
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@Pearl1594 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 15303

@Pearl1594
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@Pearl1594 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 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15305

Copy link
Contributor

@harikrishna-patnala harikrishna-patnala 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

Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR fixes the Veeam backup restore timeout mechanism by changing it from using a counter-based loop to a time-based interval approach, addressing issue #8165.

  • Changed the timeout logic from a simple counter to use actual elapsed time measurement
  • Updated test to use time-based verification instead of counting exact method calls
  • Modified logging to show elapsed time instead of iteration count

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
VeeamClient.java Replaces counter-based timeout with time-based elapsed time check using System.currentTimeMillis()
VeeamClientTest.java Updates test to use time-based timeout value and flexible verification instead of exact call count

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Copy link

Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

restoreTimeout in VeeamClient is being used as a counter

5 participants