mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
bump deps
This commit is contained in:
parent
9a63723bbe
commit
2b66641b55
@ -1781,7 +1781,7 @@ func isASCIIDigit(c byte) bool {
|
||||
// but it's so remote we're prepared to pretend it's nonexistent - since the
|
||||
// C++ generator lowercases names, it's extremely unlikely to have two fields
|
||||
// with different capitalizations.
|
||||
// In short, _my_field_name_2 becomes XMyFieldName2.
|
||||
// In short, _my_field_name_2 becomes XMyFieldName_2.
|
||||
func CamelCase(s string) string {
|
||||
if s == "" {
|
||||
return ""
|
||||
|
55
third_party/github.com/coreos/go-raft/server.go
vendored
55
third_party/github.com/coreos/go-raft/server.go
vendored
@ -927,26 +927,25 @@ func (s *Server) processRequestVoteRequest(req *RequestVoteRequest) (*RequestVot
|
||||
// Adds a peer to the server.
|
||||
func (s *Server) AddPeer(name string, connectiongString string) error {
|
||||
s.debugln("server.peer.add: ", name, len(s.peers))
|
||||
defer s.writeConf()
|
||||
|
||||
// Do not allow peers to be added twice.
|
||||
if s.peers[name] != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Skip the Peer if it has the same name as the Server
|
||||
if s.name == name {
|
||||
return nil
|
||||
if s.name != name {
|
||||
peer := newPeer(s, name, connectiongString, s.heartbeatTimeout)
|
||||
|
||||
if s.State() == Leader {
|
||||
peer.startHeartbeat()
|
||||
}
|
||||
|
||||
s.peers[peer.Name] = peer
|
||||
}
|
||||
|
||||
peer := newPeer(s, name, connectiongString, s.heartbeatTimeout)
|
||||
|
||||
if s.State() == Leader {
|
||||
peer.startHeartbeat()
|
||||
}
|
||||
|
||||
s.peers[peer.Name] = peer
|
||||
|
||||
s.debugln("server.peer.conf.write: ", name)
|
||||
// Write the configuration to file.
|
||||
s.writeConf()
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -955,26 +954,24 @@ func (s *Server) AddPeer(name string, connectiongString string) error {
|
||||
func (s *Server) RemovePeer(name string) error {
|
||||
s.debugln("server.peer.remove: ", name, len(s.peers))
|
||||
|
||||
defer s.writeConf()
|
||||
// Skip the Peer if it has the same name as the Server
|
||||
if name != s.Name() {
|
||||
// Return error if peer doesn't exist.
|
||||
peer := s.peers[name]
|
||||
if peer == nil {
|
||||
return fmt.Errorf("raft: Peer not found: %s", name)
|
||||
}
|
||||
|
||||
if name == s.Name() {
|
||||
// when the removed node restart, it should be able
|
||||
// to know it has been removed before. So we need
|
||||
// to update knownCommitIndex
|
||||
return nil
|
||||
}
|
||||
// Return error if peer doesn't exist.
|
||||
peer := s.peers[name]
|
||||
if peer == nil {
|
||||
return fmt.Errorf("raft: Peer not found: %s", name)
|
||||
// Stop peer and remove it.
|
||||
if s.State() == Leader {
|
||||
peer.stopHeartbeat(true)
|
||||
}
|
||||
|
||||
delete(s.peers, name)
|
||||
}
|
||||
|
||||
// Stop peer and remove it.
|
||||
if s.State() == Leader {
|
||||
peer.stopHeartbeat(true)
|
||||
}
|
||||
|
||||
delete(s.peers, name)
|
||||
// Write the configuration to file.
|
||||
s.writeConf()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -6,7 +6,6 @@ import (
|
||||
"fmt"
|
||||
"hash/crc32"
|
||||
"os"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@ -54,7 +53,7 @@ func (ss *Snapshot) save() error {
|
||||
}
|
||||
|
||||
// force the change writting to disk
|
||||
syscall.Fsync(int(file.Fd()))
|
||||
file.Sync()
|
||||
return err
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user