Merge pull request #4417 from cpuguy83/1.3-shim2_event_cancelled

mxpv · web-flow · commit da855486a0b4 · 2020-07-29T10:38:40.000-07:00
[release/1.3] shim: move event context timeout to publisher
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -738,9 +738,7 @@ func (s *service) forward(ctx context.Context, publisher shim.Publisher) {
 	ns, _ := namespaces.Namespace(ctx)
 	ctx = namespaces.WithNamespace(context.Background(), ns)
 	for e := range s.events {
-		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 		err := publisher.Publish(ctx, runc.GetTopic(e), e)
-		cancel()
 		if err != nil {
 			logrus.WithError(err).Error("post event")
 		}
diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go
@@ -128,7 +128,9 @@ func (l *RemoteEventsPublisher) Publish(ctx context.Context, topic string, event
 }
 
 func (l *RemoteEventsPublisher) forwardRequest(ctx context.Context, req *v1.ForwardRequest) error {
-	_, err := l.client.EventsService().Forward(ctx, req)
+	fCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	_, err := l.client.EventsService().Forward(fCtx, req)
+	cancel()
 	if err == nil {
 		return nil
 	}
@@ -142,9 +144,9 @@ func (l *RemoteEventsPublisher) forwardRequest(ctx context.Context, req *v1.Forw
 		return err
 	}
 
-	if _, err := l.client.EventsService().Forward(ctx, req); err != nil {
-		return err
-	}
+	fCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
+	_, err = l.client.EventsService().Forward(fCtx, req)
+	cancel()
 
-	return nil
+	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ func (l *RemoteEventsPublisher) Publish(ctx context.Context, topic string, event`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`func (l RemoteEventsPublisher) forwardRequest(ctx context.Context, req v1.ForwardRequest) error {`
`131`		`- _, err := l.client.EventsService().Forward(ctx, req)`
	`131`	`+ fCtx, cancel := context.WithTimeout(ctx, 5*time.Second)`
	`132`	`+ _, err := l.client.EventsService().Forward(fCtx, req)`
	`133`	`+ cancel()`
`132`	`134`	`if err == nil {`
`133`	`135`	`return nil`
`134`	`136`	`}`
`@@ -142,9 +144,9 @@ func (l RemoteEventsPublisher) forwardRequest(ctx context.Context, req v1.Forw`
`142`	`144`	`return err`
`143`	`145`	`}`
`144`	`146`
`145`		`- if _, err := l.client.EventsService().Forward(ctx, req); err != nil {`
`146`		`- return err`
`147`		`- }`
	`147`	`+ fCtx, cancel = context.WithTimeout(ctx, 5*time.Second)`
	`148`	`+ _, err = l.client.EventsService().Forward(fCtx, req)`
	`149`	`+ cancel()`
`148`	`150`
`149`		`- return nil`
	`151`	`+ return err`
`150`	`152`	`}`