Browse Source

Avoid ServeApi race condition

If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation.  This is due to the fact
that when "acceptconnections" ran the activation channel was nil.

Signed-off-by: Darren Shepherd <darren@rancher.com>
Darren Shepherd 10 năm trước cách đây
mục cha
commit
8f6a14452d
1 tập tin đã thay đổi với 1 bổ sung2 xóa
  1. 1 2
      api/server/server.go

+ 1 - 2
api/server/server.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	activationLock chan struct{}
+	activationLock chan struct{} = make(chan struct{})
 )
 
 type HttpServer struct {
@@ -1593,7 +1593,6 @@ func ServeApi(job *engine.Job) error {
 		protoAddrs = job.Args
 		chErrors   = make(chan error, len(protoAddrs))
 	)
-	activationLock = make(chan struct{})
 
 	for _, protoAddr := range protoAddrs {
 		protoAddrParts := strings.SplitN(protoAddr, "://", 2)