Merge pull request #59 from RealFax/dev

sync

Author: ChloePike

locker/mutex.go

@@ -1,6 +1,7 @@
 package locker
 
 import (
+	"errors"
 	"github.com/RealFax/RedQueen/internal/hack"
 	"time"
 
@@ -18,7 +19,7 @@ func MutexLock(lockID string, ttl int32, backend Backend) error {
 			return uint32(ttl)
 		}(),
 	); err != nil {
-		if err == store.ErrKeyAlreadyExists {
+		if errors.Is(err, store.ErrKeyAlreadyExists) {
 			return ErrStatusBusy
 		}
 		return err
@@ -27,8 +28,7 @@ func MutexLock(lockID string, ttl int32, backend Backend) error {
 }
 
 func MutexUnlock(lockID string, backend Backend) error {
-	val, err := backend.Get(hack.String2Bytes(lockID))
-	if len(val.Data) == 0 || err == store.ErrKeyNotFound {
+	if _, err := backend.Get(hack.String2Bytes(lockID)); errors.Is(err, store.ErrKeyNotFound) {
 		return ErrStatusBusy
 	}
 	return backend.Del(hack.String2Bytes(lockID))

server.go

@@ -159,11 +159,13 @@ func NewServer(cfg *config.Config) (*Server, error) {
 			return clusters
 		}(),
 	}); err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "NewServer")
 	}
 
 	// init distributed lock backend
-	server.lockerBackend = NewLockerBackend(server.store, server.applyLog)
+	if server.lockerBackend, err = NewLockerBackend(server.store, server.applyLog); err != nil {
+		return nil, errors.Wrap(err, "NewServer")
+	}
 
 	// init requests merged
 	if cfg.Node.RequestsMerged {

server_misc.go

@@ -55,11 +55,15 @@ func (w LockerBackendWrapper) Watch(key []byte) (store.WatcherNotify, error) {
 }
 
 func NewLockerBackend(
-	ns store.Namespace,
+	s store.Store,
 	raftApplyFunc func(context.Context, *serverpb.RaftLogPayload, time.Duration) error,
-) locker.Backend {
+) (locker.Backend, error) {
+	current, err := s.Namespace(locker.Namespace)
+	if err != nil {
+		return nil, err
+	}
 	return &LockerBackendWrapper{
-		store: ns,
+		store: current,
 		apply: raftApplyFunc,
-	}
+	}, nil
 }