Merge pull request #764 from amdalal/amdalal/shutdown-race-condition-3

fix race condition in shutdown
uber · May 28, 2021 · 7f3ed25 · 7f3ed25
2 parents 5b76c58 + c715f3b
commit 7f3ed25
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/runtime/gateway.go b/runtime/gateway.go
@@ -434,6 +434,9 @@ func (gateway *Gateway) Shutdown() {
 		}
 	}()
 
+	// wait for servers to shutdown before stopping GRPCClientDispatcher
+	swg.Wait()
+
 	// stop all grpc clients
 	if gateway.GRPCClientDispatcher != nil {
 		swg.Add(1)