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

feat attach etcd-index,raft-index,raft-term to header

Browse Source
This commit is contained in:
Xiang Li 2013-11-09 20:20:47 -08:00
parent d87e0e93d3
commit d8e5994c35
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/server.go
View File

@ -225,6 +225,7 @@ func (s *Server) Close() {
} }
} }
// Dispatch command to the current leader
func (s *Server) Dispatch(c raft.Command, w http.ResponseWriter, req *http.Request) error { func (s *Server) Dispatch(c raft.Command, w http.ResponseWriter, req *http.Request) error {
ps := s.peerServer ps := s.peerServer
if ps.raftServer.State() == raft.Leader { if ps.raftServer.State() == raft.Leader {
@ -252,6 +253,12 @@ func (s *Server) Dispatch(c raft.Command, w http.ResponseWriter, req *http.Reque
e, _ := result.(*store.Event) e, _ := result.(*store.Event)
b, _ = json.Marshal(e) b, _ = json.Marshal(e)
// etcd index should be the same as the event index
// which is also the last modified index of the node
w.Header().Add("X-Etcd-Index", fmt.Sprint(e.Index))
w.Header().Add("X-Raft-Index", fmt.Sprint(s.CommitIndex()))
w.Header().Add("X-Raft-Term", fmt.Sprint(s.Term()))
if e.IsCreated() { if e.IsCreated() {
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
} else { } else {

4
server/v2/get_handler.go
View File

@ -68,7 +68,9 @@ func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
} }
} }
w.Header().Add("X-Etcd-Index", fmt.Sprint(event.Index)) w.Header().Add("X-Etcd-Index", fmt.Sprint(s.Store().Index()))
w.Header().Add("X-Raft-Index", fmt.Sprint(s.CommitIndex()))
w.Header().Add("X-Raft-Term", fmt.Sprint(s.Term()))
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
b, _ := json.Marshal(event) b, _ := json.Marshal(event)

1
store/node.go
View File

@ -17,7 +17,6 @@ type Node struct {
Path string Path string
CreateIndex uint64 CreateIndex uint64
CreateTerm uint64
ModifiedIndex uint64 ModifiedIndex uint64
Parent *Node `json:"-"` // should not encode this field! avoid circular dependency. Parent *Node `json:"-"` // should not encode this field! avoid circular dependency.