Merge pull request #13252 from yuzhiquan/fix-always-true-or-false

etcdserver: remove always true or false in if statement
This commit is contained in:
Sahdev Zala 2021-08-21 14:09:43 -04:00 committed by GitHub
commit 4739d3e9d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -292,7 +292,7 @@ func (s *EtcdServer) LeaseRenew(ctx context.Context, id lease.LeaseID) (int64, e
defer cancel()
// renewals don't go through raft; forward to leader manually
for cctx.Err() == nil && err != nil {
for cctx.Err() == nil {
leader, lerr := s.waitLeader(cctx)
if lerr != nil {
return -1, lerr
@ -384,7 +384,7 @@ func (s *EtcdServer) waitLeader(ctx context.Context) (*membership.Member, error)
return nil, ErrNoLeader
}
}
if leader == nil || len(leader.PeerURLs) == 0 {
if len(leader.PeerURLs) == 0 {
return nil, ErrNoLeader
}
return leader, nil