fix: Add timeout for calling cloud-hypervisor api

smartxworks · Jan 10, 2023 · d7d5162 · d7d5162
1 parent 514a8c7
commit d7d5162
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/cmd/cloud-hypervisor-client-gen/client.go.mustache b/cmd/cloud-hypervisor-client-gen/client.go.mustache
@@ -39,7 +39,7 @@ func (c *Client) {{name}}(ctx context.Context{{#arg}}, arg {{arg}}{{/arg}}) {{#r
     }
     {{/arg}}
 
-    req, err := http.NewRequest("{{method}}", "http://localhost/api/v1{{path}}", {{#arg}}bytes.NewBuffer(reqBody){{/arg}}{{^arg}}nil{{/arg}})
+    req, err := http.NewRequestWithContext(ctx, "{{method}}", "http://localhost/api/v1{{path}}", {{#arg}}bytes.NewBuffer(reqBody){{/arg}}{{^arg}}nil{{/arg}})
     if err != nil {
         return {{#ret}}nil, {{/ret}}fmt.Errorf("build request: %s", err)
     }

diff --git a/pkg/cloudhypervisor/client.go b/pkg/cloudhypervisor/client.go
diff --git a/pkg/daemon/vm_controller.go b/pkg/daemon/vm_controller.go
@@ -386,7 +386,9 @@ func (r *VMReconciler) reconcile(ctx context.Context, vm *virtv1alpha1.VirtualMa
 				}
 			case virtv1alpha1.VirtualMachineMigrationSent:
 				if vm.Status.Migration.TargetNodeName == r.NodeName {
-					vmInfo, err := r.getMigrationTargetCloudHypervisorClient(vm).VmInfo(ctx)
+					timeoutCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
+					defer cancel()
+					vmInfo, err := r.getMigrationTargetCloudHypervisorClient(vm).VmInfo(timeoutCtx)
 					if err != nil {
 						return err
 					}