浏览代码

Merge pull request #5011 from xiang90/r_c

raft: fix issues reported by golint
Xiang Li 9 年之前
父节点
当前提交
4997ed36b4
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 1 3
      raft/raft.go
  2. 6 0
      raft/storage.go

+ 1 - 3
raft/raft.go

@@ -29,8 +29,6 @@ import (
 const None uint64 = 0
 const noLimit = math.MaxUint64
 
-var ErrSnapshotTemporarilyUnavailable = errors.New("snapshot is temporarily unavailable")
-
 // Possible values for StateType.
 const (
 	StateFollower StateType = iota
@@ -231,7 +229,7 @@ func newRaft(c *Config) *raft {
 	}
 	r.becomeFollower(r.Term, None)
 
-	nodesStrs := make([]string, 0)
+	var nodesStrs []string
 	for _, n := range r.nodes() {
 		nodesStrs = append(nodesStrs, fmt.Sprintf("%x", n))
 	}

+ 6 - 0
raft/storage.go

@@ -29,8 +29,14 @@ var ErrCompacted = errors.New("requested index is unavailable due to compaction"
 // index is older than the existing snapshot.
 var ErrSnapOutOfDate = errors.New("requested index is older than the existing snapshot")
 
+// ErrUnavailable is returned by Storage interface when the requested log entries
+// are unavailable.
 var ErrUnavailable = errors.New("requested entry at index is unavailable")
 
+// ErrSnapshotTemporarilyUnavailable is returned by the Storage interface when the required
+// snapshot is temporarily unavailable.
+var ErrSnapshotTemporarilyUnavailable = errors.New("snapshot is temporarily unavailable")
+
 // Storage is an interface that may be implemented by the application
 // to retrieve log entries from storage.
 //