From 8f276ef29583e363bb886170f2f424f2d2a0e244 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Thu, 30 Jan 2025 15:25:31 +0100 Subject: pkg/vminfo: gracefully handle context abortion On context abortion, return a special error. On the pkg/rpcserver side, recognize and process it. --- pkg/rpcserver/rpcserver.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg/rpcserver') diff --git a/pkg/rpcserver/rpcserver.go b/pkg/rpcserver/rpcserver.go index bcfcbdf41..d0e6a15f1 100644 --- a/pkg/rpcserver/rpcserver.go +++ b/pkg/rpcserver/rpcserver.go @@ -420,6 +420,10 @@ func (serv *server) runCheck(ctx context.Context, info *handshakeResult) error { close(serv.cfg.machineCheckStarted) } enabledCalls, disabledCalls, features, checkErr := serv.checker.Run(ctx, info.Files, info.Features) + if checkErr == vminfo.ErrAborted { + return nil + } + enabledCalls, transitivelyDisabled := serv.target.TransitivelyEnabledCalls(enabledCalls) // Note: need to print disbled syscalls before failing due to an error. // This helps to debug "all system calls are disabled". -- cgit mrf-deployment