aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-19 22:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

CC: Add configurable context timeout for StopVM in remote hyp

Browse Source 
Add configurable context timeout for StopVM in remote hypervisor
similar to StartVM

Fixes: #6730

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
This commit is contained in:
Pradipta Banerjee
2023-05-02 14:04:49 +00:00
parent 796c8d5015
commit 1f0d709be6
1 changed files with 13 additions and 1 deletions
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 {
// 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)
if err != nil {
return err
@@ -143,8 +152,11 @@ func (rh *remoteHypervisor) StopVM(ctx context.Context, waitOnly bool) error {
req := &pb.StopVMRequest{
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)
}