apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix command execution handling

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2024-08-01 16:40:35 +05:30
parent 1933f9e3ee
commit e066c5a919
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/apache/cloudstack/backup/BackupAnswer.java
View File

@ -24,9 +24,9 @@ import com.cloud.agent.api.Answer;
import java.util.Map;
public class BackupAnswer extends Answer {
Long size;
Long virtualSize;
Map<String, String> volumes;
private Long size;
private Long virtualSize;
private Map<String, String> volumes;
public BackupAnswer(final TakeBackupCommand command, final boolean success, final String details) {
super(command, success, details);

2
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
View File

@ -166,7 +166,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
if (answer != null) {
BackupVO backup = new BackupVO();
backup.setVmId(vm.getId());
backup.setExternalId(String.format("%s|%s|%s", nasType, backupStoragePath, backupPath));
backup.setExternalId(String.format("%s:%s/%s", nasType, vm.getInstanceName(), backupPath));
backup.setType("FULL");
backup.setDate(new Date());
backup.setSize(answer.getSize());

26
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
View File

@ -23,11 +23,14 @@ import com.cloud.agent.api.Answer;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
import com.cloud.utils.Pair;
import com.cloud.utils.script.Script;
import org.apache.cloudstack.backup.BackupAnswer;
import org.apache.cloudstack.backup.TakeBackupCommand;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@ResourceWrapper(handles = TakeBackupCommand.class)
public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCommand, Answer, LibvirtComputingResource> {
@ -36,17 +39,22 @@ public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCo
final String vmName = command.getVmName();
final String backupStoragePath = command.getBackupStoragePath();
final String backupFolder = command.getBackupPath();
Script cmd = new Script(libvirtComputingResource.getNasBackupPath(), libvirtComputingResource.getCmdsTimeout(), logger);
cmd.add("-b", vmName);
cmd.add("-s", backupStoragePath);
cmd.add("-p", String.format("%s%s%s", vmName, File.separator, backupFolder));
String result = cmd.execute();
if (result == null) {
logger.debug("Failed to take VM backup: " + result);
return new BackupAnswer(command, false, result);
List<String[]> commands = new ArrayList<>();
commands.add(new String[]{libvirtComputingResource.getNasBackupPath(),
"-b", vmName,
"-s", backupStoragePath,
"-p", String.format("%s%s%s", vmName, File.separator, backupFolder) });
Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
if (result.first() != 0) {
logger.debug("Failed to take VM backup: " + result.second());
return new BackupAnswer(command, false, result.second());
}
BackupAnswer answer = new BackupAnswer(command, true, null);
answer.setSize(Long.valueOf(result));
answer.setSize(Long.valueOf(result.second()));
return answer;
}
}