Merge pull request #65 from RealFax/dev

[Server::patch] stash

Author: ChloePike

raft.go

@@ -85,7 +85,7 @@ func RaftWithBoltLogStore(path string) RaftServerOption {
 	return func(r *Raft) (err error) {
 		r.logStore, err = raftboltdb.NewBoltStore(path)
 		if err != nil {
-			return errors.Wrap(err, "bolt-log-Store")
+			return errors.Wrap(err, "bolt-log-store")
 		}
 		return
 	}
@@ -95,7 +95,7 @@ func RaftWithStdStableStore(store store.Store) RaftServerOption {
 	return func(r *Raft) (err error) {
 		r.stableStore, err = NewStableStore(store)
 		if err != nil {
-			return errors.Wrap(err, "std-stable-Store")
+			return errors.Wrap(err, "std-stable-store")
 		}
 		return
 	}
@@ -105,7 +105,7 @@ func RaftWithFileSnapshotStore(path string, retain int, logOut io.Writer) RaftSe
 	return func(r *Raft) (err error) {
 		r.snapshotStore, err = raft.NewFileSnapshotStore(path, retain, logOut)
 		if err != nil {
-			return errors.Wrap(err, "file-snapshot-Store")
+			return errors.Wrap(err, "file-snapshot-store")
 		}
 		return
 	}

server.go

@@ -123,7 +123,7 @@ func NewServer(cfg *config.Config) (*Server, error) {
 		go server.pprofServer.Run()
 	}
 
-	// init server Store backend
+	// init server store backend
 	if server.store, err = newStoreBackend(cfg.Store, cfg.Node.DataDir); err != nil {
 		return nil, err
 	}

v1_server.go

@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/raft"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"io"
-	"sync/atomic"
 	"time"
 
 	"google.golang.org/grpc/codes"
@@ -43,7 +42,7 @@ type Internal interface {
 func (s *Server) responseHeader() *serverpb.ResponseHeader {
 	return &serverpb.ResponseHeader{
 		ClusterId: s.clusterID,
-		RaftTerm:  atomic.LoadUint64(&s.term),
+		RaftTerm:  s.raft.Term(),
 	}
 }