Skip to content

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+7 −5
Open

Veeam: Use restore timeout as an interval as opposed to a counter #11772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e81a8d9
Veeam: Use restore timeout as a time interval as opposed to a counter
Pearl1594 Oct 1, 2025
cd63800
fix log
Pearl1594 Oct 1, 2025
bb1443d
fix unit test
Pearl1594 Oct 6, 2025
ca5bfea
remove unused imports
Pearl1594 Oct 6, 2025
df84308
fix comment
Pearl1594 Oct 6, 2025
11cab28
unused import
Pearl1594 Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,9 @@ private boolean checkTaskStatus(final HttpResponse response) throws IOException
* that is used to wait for the restore to complete before throwing a {@link CloudRuntimeException}.
*/
protected void checkIfRestoreSessionFinished(String type, String path) throws IOException {
for (int j = 0; j < restoreTimeout; j++) {
long startTime = System.currentTimeMillis();
long timeoutMs = restoreTimeout * 1000L;
if (System.currentTimeMillis() - startTime < timeoutMs) {
HttpResponse relatedResponse = get(path);
RestoreSession session = parseRestoreSessionResponse(relatedResponse);
if (session.getResult().equals("Success")) {
Expand All @@ -380,7 +382,8 @@ protected void checkIfRestoreSessionFinished(String type, String path) throws IO
getRestoreVmErrorDescription(StringUtils.substringAfterLast(sessionUid, ":"))));
throw new CloudRuntimeException(String.format("Restore job [%s] failed.", sessionUid));
}
logger.debug(String.format("Waiting %s seconds, out of a total of %s seconds, for the restore backup process to finish.", j, restoreTimeout));
logger.debug("Waiting {} seconds, out of a total of {} seconds, for the restore backup process to finish.",
(System.currentTimeMillis() - startTime) / 1000, restoreTimeout);

try {
Thread.sleep(1000);
Expand Down
5 changes: 2 additions & 3 deletions plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/veeam/VeeamClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.times;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -157,7 +156,7 @@ public void getRepositoryNameFromJobTestSuccess() throws Exception {
@Test
public void checkIfRestoreSessionFinishedTestTimeoutException() throws IOException {
try {
ReflectionTestUtils.setField(mockClient, "restoreTimeout", 10);
ReflectionTestUtils.setField(mockClient, "restoreTimeout", 2);
RestoreSession restoreSession = Mockito.mock(RestoreSession.class);
HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
Mockito.when(mockClient.get(Mockito.anyString())).thenReturn(httpResponse);
Expand All @@ -169,7 +168,7 @@ public void checkIfRestoreSessionFinishedTestTimeoutException() throws IOExcepti
} catch (Exception e) {
Assert.assertEquals("Related job type: RestoreTest was not successful", e.getMessage());
}
Mockito.verify(mockClient, times(10)).get(Mockito.anyString());
Mockito.verify(mockClient, Mockito.atLeastOnce()).get(Mockito.anyString());
}

@Test
Expand Down
Loading