Skip to content

Commit

Permalink
Revert "etcdserver/api/v3rpc: "MemberList" never return non-empty Cli…
Browse files Browse the repository at this point in the history
…entURLs"

This reverts commit 0372cfc.
  • Loading branch information
gyuho committed Aug 18, 2020
1 parent c60dabf commit 299e0f1
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions etcdserver/api/v3rpc/member.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ package v3rpc

import (
"context"
"fmt"
"os"
"time"

"go.etcd.io/etcd/etcdserver"
Expand Down Expand Up @@ -91,19 +89,6 @@ func (cs *ClusterServer) MemberUpdate(ctx context.Context, r *pb.MemberUpdateReq

func (cs *ClusterServer) MemberList(ctx context.Context, r *pb.MemberListRequest) (*pb.MemberListResponse, error) {
membs := membersToProtoMembers(cs.cluster.Members())
for idx := range membs {
mv := membs[idx]
if len(mv.ClientURLs) == 0 {
mv.ClientURLs = []string{"invalid"}
fmt.Fprintf(os.Stderr, "[EKS-DEBUG] member %x (name %q) has empty ClientURLs, adding placeholder value to prevent ClientURLs[0] panic [ClientURLs %q, PeerURLs %q]",
mv.ID,
mv.Name,
mv.ClientURLs,
mv.PeerURLs,
)
}
membs[idx] = mv
}
return &pb.MemberListResponse{Header: cs.header(), Members: membs}, nil
}

Expand Down

0 comments on commit 299e0f1

Please sign in to comment.