mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'origin/4.14'
This commit is contained in:
commit
a9175d39a5
@ -33,6 +33,7 @@ import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
|
|||||||
import com.cloud.resource.CommandWrapper;
|
import com.cloud.resource.CommandWrapper;
|
||||||
import com.cloud.resource.ResourceWrapper;
|
import com.cloud.resource.ResourceWrapper;
|
||||||
import com.cloud.storage.Storage.StoragePoolType;
|
import com.cloud.storage.Storage.StoragePoolType;
|
||||||
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
import com.cloud.agent.api.GetVolumeStatsAnswer;
|
import com.cloud.agent.api.GetVolumeStatsAnswer;
|
||||||
import com.cloud.agent.api.GetVolumeStatsCommand;
|
import com.cloud.agent.api.GetVolumeStatsCommand;
|
||||||
import com.cloud.agent.api.VolumeStatsEntry;
|
import com.cloud.agent.api.VolumeStatsEntry;
|
||||||
@ -52,7 +53,7 @@ public final class LibvirtGetVolumeStatsCommandWrapper extends CommandWrapper<Ge
|
|||||||
statEntry.put(volumeUuid, getVolumeStat(libvirtComputingResource, conn, volumeUuid, storeUuid, poolType));
|
statEntry.put(volumeUuid, getVolumeStat(libvirtComputingResource, conn, volumeUuid, storeUuid, poolType));
|
||||||
}
|
}
|
||||||
return new GetVolumeStatsAnswer(cmd, "", statEntry);
|
return new GetVolumeStatsAnswer(cmd, "", statEntry);
|
||||||
} catch (LibvirtException e) {
|
} catch (LibvirtException | CloudRuntimeException e) {
|
||||||
return new GetVolumeStatsAnswer(cmd, "Can't get vm disk stats: " + e.getMessage(), null);
|
return new GetVolumeStatsAnswer(cmd, "Can't get vm disk stats: " + e.getMessage(), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user