Ver código fonte

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>
(cherry picked from commit 8f6a14452dfd88aedc8ac9577a98c38a555baadc)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Darren Shepherd 10 anos atrás
pai
commit
72e14a1566
1 arquivos alterados com 1 adições e 2 exclusões
  1. 1 2
      api/server/server.go

+ 1 - 2
api/server/server.go

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