File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -73,20 +73,25 @@ func init() {
7373 return nil , err
7474 }
7575
76+ etcdCtx , etcdCancel := context .WithCancel (context .Background ())
77+
7678 // the etcd server must be up before NewServer because storage decorators access it right away
7779 if completedConfig .EmbeddedEtcd .Config != nil {
78- if err := embeddedetcd .NewServer (completedConfig .EmbeddedEtcd ).Run (ctx ); err != nil {
80+ if err := embeddedetcd .NewServer (completedConfig .EmbeddedEtcd ).Run (etcdCtx ); err != nil {
81+ etcdCancel ()
7982 return nil , err
8083 }
8184 }
8285
8386 stopCh := make (chan struct {})
8487 s , err := server .NewServer (completedConfig )
8588 if err != nil {
89+ etcdCancel ()
8690 return nil , err
8791 }
8892 go func () {
8993 defer close (stopCh )
94+ defer etcdCancel ()
9095 if err := s .Run (ctx ); err != nil && ctx .Err () == nil {
9196 t .Errorf ("`kcp` failed: %v" , err )
9297 }
You can’t perform that action at this time.
0 commit comments