-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Veeam: Use restore timeout as an interval as opposed to a counter #11772
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
base: main
Are you sure you want to change the base?
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. 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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
Outdated
Show resolved
Hide resolved
@blueorangutan package |
@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. |
Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 15271 |
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 |
@blueorangutan package |
@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. |
Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 15303 |
@blueorangutan package |
@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. |
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15305 |
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
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.
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.
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
Outdated
Show resolved
Hide resolved
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
Outdated
Show resolved
Hide resolved
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
Outdated
Show resolved
Hide resolved
|
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
Description
This PR fixes: #8165
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?