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

redirect join to server port

Browse Source
This commit is contained in:
Xiang Li 2013-07-10 20:00:05 -07:00
parent 8af746ef6d
commit 45af72c941
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client_handlers.go
View File

@ -51,7 +51,7 @@ func SetHttpHandler(w *http.ResponseWriter, req *http.Request) {
(*w).WriteHeader(http.StatusInternalServerError)
}
dispatch(command, w, req)
dispatch(command, w, req, true)
}
@ -77,7 +77,7 @@ func TestAndSetHttpHandler(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
}
dispatch(command, &w, req)
dispatch(command, &w, req, true)
}
@ -90,11 +90,11 @@ func DeleteHttpHandler(w *http.ResponseWriter, req *http.Request) {
command := &DeleteCommand{}
command.Key = key
dispatch(command, w, req)
dispatch(command, w, req, true)
}
// Dispatch the command to leader
func dispatch(c Command, w *http.ResponseWriter, req *http.Request) {
func dispatch(c Command, w *http.ResponseWriter, req *http.Request, client bool) {
if raftServer.State() == "leader" {
if body, err := raftServer.Do(c); err != nil {
warn("Commit failed %v", err)
@ -132,7 +132,13 @@ func dispatch(c Command, w *http.ResponseWriter, req *http.Request) {
scheme = "http://"
}
url := scheme + raftTransporter.GetLeaderClientAddress() + path
var url string
if client {
url = scheme + raftTransporter.GetLeaderClientAddress() + path
} else {
url = scheme + raftServer.Leader() + path
}
debug("Redirect to %s", url)

22
etcd.go
View File

@ -425,6 +425,7 @@ func getInfo(path string) *Info {
// Delete the old configuration if exist
if ignore {
logPath := fmt.Sprintf("%s/log", path)
snapshotPath := fmt.Sprintf("%s/snapshotPath", path)
os.Remove(infoPath)
@ -507,11 +508,20 @@ func joinCluster(s *raft.Server, serverName string) error {
json.NewEncoder(&b).Encode(command)
// t must be ok
t, _ := raftServer.Transporter().(transporter)
t, ok := raftServer.Transporter().(transporter)
if !ok {
panic("wrong type")
}
debug("Send Join Request to %s", serverName)
resp, err := t.Post(fmt.Sprintf("%s/join", serverName), &b)
debug("Finish Join Request to %s", serverName)
for {
fmt.Println(err, resp)
if err != nil {
return fmt.Errorf("Unable to join: %v", err)
}
@ -520,17 +530,17 @@ func joinCluster(s *raft.Server, serverName string) error {
if resp.StatusCode == http.StatusOK {
return nil
}
if resp.StatusCode == http.StatusServiceUnavailable {
address, err := ioutil.ReadAll(resp.Body)
if err != nil {
warn("Cannot Read Leader info: %v", err)
}
if resp.StatusCode == http.StatusTemporaryRedirect {
fmt.Println("redirect")
address = resp.Header.Get("Location")
debug("Leader is %s", address)
debug("Send Join Request to %s", address)
json.NewEncoder(&b).Encode(command)
resp, err = t.Post(fmt.Sprintf("%s/join", address), &b)
}
}
}
return fmt.Errorf("Unable to join: %v", err)
}

2
raft_handlers.go
View File

@ -86,7 +86,7 @@ func JoinHttpHandler(w http.ResponseWriter, req *http.Request) {
if err := decodeJsonRequest(req, command); err == nil {
debug("Receive Join Request from %s", command.Name)
dispatch(command, &w, req)
dispatch(command, &w, req, false)
} else {
w.WriteHeader(http.StatusInternalServerError)
return