Merge pull request #2696 from liubin/master

virtcontainers: GetOOMEvent should have no timeout
kata-containers · May 21, 2020 · 5cef3e7 · 5cef3e7
2 parents e7df922 + f76d739
commit 5cef3e7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -2008,8 +2008,8 @@ func (k *kataAgent) installReqFunc(c *kataclient.AgentClient) {
 func (k *kataAgent) getReqContext(reqName string) (ctx context.Context, cancel context.CancelFunc) {
 	ctx = context.Background()
 	switch reqName {
-	case grpcWaitProcessRequest:
-		// Wait has no timeout
+	case grpcWaitProcessRequest, grpcGetOOMEventRequest:
+		// Wait and GetOOMEvent have no timeout
 	case grpcCheckRequest:
 		ctx, cancel = context.WithTimeout(ctx, checkRequestTimeout)
 	default: