Damans227 commented on code in PR #14502:
URL: https://github.com/apache/cloudstack/pull/14502#discussion_r4389166423
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java:
##########
@@ -6363,14 +6363,15 @@ public static String
generateSecretUUIDFromString(String seed) {
* @param snapshotName Name of the snapshot;
* @param volume VolumeObjectTO of the corresponding volume;
* @param conn Libvirt connection;
+ * @param timeout the timeout in milisseconds
* @throws LibvirtException
*/
public void mergeSnapshotIntoBaseFile(Domain vm, String diskLabel, String
baseFilePath, String topFilePath, boolean active, String snapshotName,
VolumeObjectTO volume,
- Connect conn) throws LibvirtException {
+ Connect conn, long timeout) throws LibvirtException {
if
(AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LIBVIRT_EVENTS_ENABLED))
{
mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(vm,
diskLabel, baseFilePath, topFilePath, active, snapshotName, volume, conn);
Review Comment:
fair, events is off by default so keeping it for now makes sense.
##########
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java:
##########
@@ -86,6 +86,7 @@ public class KvmFileBasedStorageVmSnapshotStrategy extends
StorageVMSnapshotStra
private static final List<Storage.StoragePoolType>
supportedStoragePoolTypes = List.of(Storage.StoragePoolType.Filesystem,
Storage.StoragePoolType.NetworkFilesystem,
Storage.StoragePoolType.SharedMountPoint);
private static final String KVM_FILE_BASED_STORAGE_SNAPSHOT_NVRAM =
"kvmFileBasedStorageSnapshotNvram";
+ private static final int DEFAULT_MERGE_TIMEOUT = 10800;
Review Comment:
that covers it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
