Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth, etcdserver: add a method for recoverying from backend during apply snapshot

Browse Source 
This commit adds a new method Recovery() to auth.AuthStore for
recoverying auth state from backend during apply snapshot. It follows
a manner of the lessor.
This commit is contained in:
Hitoshi Mitake 2016-03-21 22:43:41 +09:00 committed by Hitoshi Mitake
parent 7879429a94
commit 4e39f690f2
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
auth/store.go
View File

@ -19,10 +19,6 @@ import (
"github.com/coreos/etcd/storage/backend"
)
type backendGetter interface {
Backend() backend.Backend
}
var (
enableFlagKey = []byte("authEnabled")
authBucketName = []byte("auth")
@ -33,16 +29,19 @@ var (
type AuthStore interface {
// AuthEnable() turns on the authentication feature
AuthEnable()
// Recover recovers the state of auth store from the given backend
Recover(b backend.Backend)
}
type authStore struct {
bgetter backendGetter
be backend.Backend
}
func (as *authStore) AuthEnable() {
value := []byte{1}
b := as.bgetter.Backend()
b := as.be
tx := b.BatchTx()
tx.Lock()
tx.UnsafePut(authBucketName, enableFlagKey, value)
@ -52,15 +51,19 @@ func (as *authStore) AuthEnable() {
plog.Noticef("Authentication enabled")
}
func NewAuthStore(bgetter backendGetter) *authStore {
b := bgetter.Backend()
tx := b.BatchTx()
func (as *authStore) Recover(be backend.Backend) {
as.be = be
// TODO(mitake): recovery process
}
func NewAuthStore(be backend.Backend) *authStore {
tx := be.BatchTx()
tx.Lock()
tx.UnsafeCreateBucket(authBucketName)
tx.Unlock()
b.ForceCommit()
be.ForceCommit()
return &authStore{
bgetter: bgetter,
be: be,
}
}

6
etcdserver/server.go
View File

@ -374,7 +374,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
srv.be = backend.NewDefaultBackend(path.Join(cfg.SnapDir(), databaseFilename))
srv.lessor = lease.NewLessor(srv.be)
srv.kv = dstorage.New(srv.be, srv.lessor, &srv.consistIndex)
srv.authStore = auth.NewAuthStore(srv)
srv.authStore = auth.NewAuthStore(srv.be)
if h := cfg.AutoCompactionRetention; h != 0 {
srv.compactor = compactor.NewPeriodic(h, srv.kv, srv)
srv.compactor.Run()
@ -621,6 +621,10 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) {
if s.lessor != nil {
s.lessor.Recover(newbe, s.kv)
}
if s.authStore != nil {
s.authStore.Recover(newbe)
}
}
if err := s.store.Recovery(apply.snapshot.Data); err != nil {
plog.Panicf("recovery store error: %v", err)