github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-24 10:41:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6774 from bpradipt/fix-6730

Browse Source 
CC | runtime: Add configurable context timeout for StopVM
This commit is contained in:
Fabiano Fidêncio 2023-05-04 15:06:08 +02:00 committed by GitHub
commit 3b9ae6716c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/runtime/virtcontainers/remote.go
View File

@ -134,6 +134,15 @@ func (rh *remoteHypervisor) AttestVM(ctx context.Context) error {
func (rh *remoteHypervisor) StopVM(ctx context.Context, waitOnly bool) error { func (rh *remoteHypervisor) StopVM(ctx context.Context, waitOnly bool) error {
// waitOnly doesn't make sense for remote hypervisor and suited for local hypervisor.
// Instead use a similar logic like StartVM to handle StopVM with timeout.
timeout := defaultMinTimeout
if rh.config.RemoteHypervisorTimeout > 0 {
timeout = int(rh.config.RemoteHypervisorTimeout)
}
s, err := openRemoteService(rh.config.RemoteHypervisorSocket) s, err := openRemoteService(rh.config.RemoteHypervisorSocket)
if err != nil { if err != nil {
return err return err
@ -143,8 +152,11 @@ func (rh *remoteHypervisor) StopVM(ctx context.Context, waitOnly bool) error {
req := &pb.StopVMRequest{ req := &pb.StopVMRequest{
Id: string(rh.sandboxID), Id: string(rh.sandboxID),
} }
ctx2, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
defer cancel()
if _, err := s.client.StopVM(context.Background(), req); err != nil { logrus.Printf("calling remote hypervisor StopVM (timeout: %d)", timeout)
if _, err := s.client.StopVM(ctx2, req); err != nil {
return fmt.Errorf("remote hypervisor call failed: %w", err) return fmt.Errorf("remote hypervisor call failed: %w", err)
} }