|
@@ -932,9 +932,8 @@ func (s *EtcdServer) isLeader() bool {
|
|
|
return uint64(s.ID()) == s.Lead()
|
|
return uint64(s.ID()) == s.Lead()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// transferLeadership transfers the leader to the given transferee.
|
|
|
|
|
-// TODO: maybe expose to client?
|
|
|
|
|
-func (s *EtcdServer) transferLeadership(ctx context.Context, lead, transferee uint64) error {
|
|
|
|
|
|
|
+// MoveLeader transfers the leader to the given transferee.
|
|
|
|
|
+func (s *EtcdServer) MoveLeader(ctx context.Context, lead, transferee uint64) error {
|
|
|
now := time.Now()
|
|
now := time.Now()
|
|
|
interval := time.Duration(s.Cfg.TickMs) * time.Millisecond
|
|
interval := time.Duration(s.Cfg.TickMs) * time.Millisecond
|
|
|
|
|
|
|
@@ -973,7 +972,7 @@ func (s *EtcdServer) TransferLeadership() error {
|
|
|
|
|
|
|
|
tm := s.Cfg.ReqTimeout()
|
|
tm := s.Cfg.ReqTimeout()
|
|
|
ctx, cancel := context.WithTimeout(s.ctx, tm)
|
|
ctx, cancel := context.WithTimeout(s.ctx, tm)
|
|
|
- err := s.transferLeadership(ctx, s.Lead(), uint64(transferee))
|
|
|
|
|
|
|
+ err := s.MoveLeader(ctx, s.Lead(), uint64(transferee))
|
|
|
cancel()
|
|
cancel()
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|