etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug on list of vm on the instances

This commit is contained in:
Pierre Charton 2024-11-07 10:09:57 +01:00
parent 5eae84851a
commit 655080678d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
View File

@ -40,7 +40,6 @@ import org.apache.cloudstack.backup.backroll.model.BackrollTaskStatus;
import org.apache.cloudstack.backup.backroll.model.BackrollVmBackup;
import org.apache.cloudstack.backup.backroll.model.response.BackrollTaskRequestResponse;
import org.apache.cloudstack.backup.backroll.model.response.TaskState;
import org.apache.cloudstack.backup.backroll.model.response.TaskStateResponse;
import org.apache.cloudstack.backup.backroll.model.response.api.LoginApiResponse;
import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollArchiveResponse;
import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollBackupsFromVMResponse;
@ -223,9 +222,12 @@ public class BackrollClient {
response.close();
String urlToRequest = requestResponse.location.replace("/api/v1", "");
result = waitGet(urlToRequest);
TaskStateResponse taskResponse = new ObjectMapper().readValue(result, TaskStateResponse.class);
logger.debug("RESTORE {}", taskResponse.state);
isRestoreOk = taskResponse.state.equals(TaskState.SUCCESS);
if(result.contains("SUCCESS")) {
logger.debug("RESTORE SUCCESS");
isRestoreOk = true;
}
} catch (final NotOkBodyException e) {
return false;
} catch (final IOException | InterruptedException e) {

2
ui/src/components/view/ListResourceTable.vue
View File

@ -51,7 +51,7 @@
</template>
<template v-else-if="column.key === 'size' || column.key === 'virtualsize'">
{{ bytesToHumanReadableSize(text) }}
{{ $bytesToHumanReadableSize(text) }}
</template>
<template v-else>