From e96dbfb973eb8c47aa635444e435370bcaa8c282 Mon Sep 17 00:00:00 2001 From: caoming Date: Tue, 8 Jan 2019 08:56:55 +0800 Subject: [PATCH] api/v2auth: remove defer in loop. --- etcdserver/api/v2auth/auth_requests.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index 21369860c..d6574ecca 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -32,7 +32,6 @@ func (s *store) ensureAuthDirectories() error { } for _, res := range []string{StorePermsPrefix, StorePermsPrefix + "/users/", StorePermsPrefix + "/roles/"} { ctx, cancel := context.WithTimeout(context.Background(), s.timeout) - defer cancel() pe := false rr := etcdserverpb.Request{ Method: "PUT", @@ -41,6 +40,7 @@ func (s *store) ensureAuthDirectories() error { PrevExist: &pe, } _, err := s.server.Do(ctx, rr) + cancel() if err != nil { if e, ok := err.(*v2error.Error); ok { if e.ErrorCode == v2error.EcodeNodeExist {