Merge pull request #4281 from mitake/remove-cached-auth-flag
etcdserver, auth: not cache a flag of auth statusrelease-2.3
commit
dd1bbaa293
|
@ -102,8 +102,7 @@ type store struct {
|
|||
timeout time.Duration
|
||||
ensuredOnce bool
|
||||
|
||||
mu sync.Mutex // protect enabled
|
||||
enabled *bool
|
||||
mu sync.Mutex // protect enabled
|
||||
|
||||
PasswordStore
|
||||
}
|
||||
|
@ -440,8 +439,6 @@ func (s *store) EnableAuth() error {
|
|||
return err
|
||||
}
|
||||
|
||||
b := true
|
||||
s.enabled = &b
|
||||
plog.Noticef("auth: enabled auth")
|
||||
return nil
|
||||
}
|
||||
|
@ -456,8 +453,6 @@ func (s *store) DisableAuth() error {
|
|||
|
||||
err := s.disableAuth()
|
||||
if err == nil {
|
||||
b := false
|
||||
s.enabled = &b
|
||||
plog.Noticef("auth: disabled auth")
|
||||
} else {
|
||||
plog.Errorf("error disabling auth (%v)", err)
|
||||
|
|
|
@ -85,15 +85,10 @@ func (s *store) detectAuth() bool {
|
|||
if s.server == nil {
|
||||
return false
|
||||
}
|
||||
if s.enabled != nil {
|
||||
return *s.enabled
|
||||
}
|
||||
value, err := s.requestResource("/enabled", false)
|
||||
if err != nil {
|
||||
if e, ok := err.(*etcderr.Error); ok {
|
||||
if e.ErrorCode == etcderr.EcodeKeyNotFound {
|
||||
b := false
|
||||
s.enabled = &b
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
@ -107,7 +102,6 @@ func (s *store) detectAuth() bool {
|
|||
plog.Errorf("internal bookkeeping value for enabled isn't valid JSON (%v)", err)
|
||||
return false
|
||||
}
|
||||
s.enabled = &u
|
||||
return u
|
||||
}
|
||||
|
||||
|
|
|
@ -615,8 +615,6 @@ func TestDisableAuth(t *testing.T) {
|
|||
t.Error("Expected error; already disabled")
|
||||
}
|
||||
|
||||
// clear cache
|
||||
s.enabled = nil
|
||||
err = s.DisableAuth()
|
||||
if err != nil {
|
||||
t.Error("Unexpected error", err)
|
||||
|
|
Loading…
Reference in New Issue