minor enhance the boot/run/clone speed of ch and fc

Author: CMGS

hypervisor/cloudhypervisor/clone.go

@@ -178,10 +178,11 @@ func (ch *CloudHypervisor) restoreAndResumeClone(
 		}
 	}()
 
-	if err = restoreVM(ctx, sockPath, runDir, opts.onDemand); err != nil {
+	hc := utils.NewSocketHTTPClientWithTimeout(sockPath, hypervisor.VMMemTransferTimeout)
+
+	if err = restoreVM(ctx, hc, runDir, opts.onDemand); err != nil {
 		return fmt.Errorf("vm.restore: %w", err)
 	}
-	hc := utils.NewSocketHTTPClient(sockPath)
 
 	if err = hotSwapNets(ctx, hc, opts.snapshotCfg.Nets, opts.networkConfigs); err != nil {
 		return fmt.Errorf("hot-swap NICs: %w", err)

hypervisor/cloudhypervisor/helper.go

@@ -96,7 +96,7 @@ type chRestoreConfig struct {
 	MemoryRestoreMode chMemoryRestoreMode `json:"memory_restore_mode,omitempty"`
 }
 
-func restoreVM(ctx context.Context, sockPath, sourceDir string, onDemand bool) error {
+func restoreVM(ctx context.Context, hc *http.Client, sourceDir string, onDemand bool) error {
 	cfg := chRestoreConfig{
 		SourceURL: "file://" + sourceDir,
 	}
@@ -107,7 +107,6 @@ func restoreVM(ctx context.Context, sockPath, sourceDir string, onDemand bool) e
 	if err != nil {
 		return fmt.Errorf("marshal restore request: %w", err)
 	}
-	hc := utils.NewSocketHTTPClientWithTimeout(sockPath, hypervisor.VMMemTransferTimeout)
 	_, err = utils.DoAPI(ctx, hc, http.MethodPut,
 		"http://localhost/api/v1/vm.restore", body, http.StatusNoContent)
 	return err

hypervisor/cloudhypervisor/restore.go

@@ -135,10 +135,11 @@ func (ch *CloudHypervisor) restoreAfterExtract(ctx context.Context, vmID string,
 		}
 	}()
 
-	if err = restoreVM(ctx, sockPath, rec.RunDir, vmCfg.OnDemand); err != nil {
+	hc := utils.NewSocketHTTPClientWithTimeout(sockPath, hypervisor.VMMemTransferTimeout)
+
+	if err = restoreVM(ctx, hc, rec.RunDir, vmCfg.OnDemand); err != nil {
 		return nil, fmt.Errorf("vm.restore: %w", err)
 	}
-	hc := utils.NewSocketHTTPClient(sockPath)
 	if err = resumeVM(ctx, hc); err != nil {
 		return nil, fmt.Errorf("vm.resume: %w", err)
 	}

hypervisor/utils.go

@@ -182,7 +182,7 @@ func VerifyBaseFiles(storageConfigs []*types.StorageConfig, boot *types.BootConf
 
 // WaitForSocket polls until socketPath is connectable or the process exits.
 func WaitForSocket(ctx context.Context, socketPath string, pid int, timeout time.Duration, processName string) error {
-	return utils.WaitFor(ctx, timeout, 100*time.Millisecond, func() (bool, error) { //nolint:mnd
+	return utils.WaitFor(ctx, timeout, 1*time.Millisecond, func() (bool, error) { //nolint:mnd
 		if utils.CheckSocket(socketPath) == nil {
 			return true, nil
 		}