diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-04-22 20:43:34 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-04-22 20:43:34 -0700 |
| commit | 69eda558efd643c372edf936369a0049e58b93b3 (patch) | |
| tree | 58c6f8847758d9125ff5a1d6cca7f3b0b5fdd6ee | |
| parent | aebe39a80388e699ca9b210929159d9d9d552b29 (diff) | |
| download | seaweedfs-69eda558efd643c372edf936369a0049e58b93b3.tar.xz seaweedfs-69eda558efd643c372edf936369a0049e58b93b3.zip | |
reduce the connections
fix https://github.com/chrislusf/seaweedfs/issues/1277
this avoids sending error to wdclients, and clients retry the connections
| -rw-r--r-- | weed/server/master_grpc_server.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 035ed4435..9f5bf569d 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -11,7 +11,6 @@ import ( "google.golang.org/grpc/peer" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/storage/needle" @@ -191,18 +190,6 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ peerAddress := findClientAddress(stream.Context(), req.GrpcPort) - // only one shell can be connected at any time - if req.Name == pb.AdminShellClient { - if ms.currentAdminShellClient == "" { - ms.currentAdminShellClient = peerAddress - defer func() { - ms.currentAdminShellClient = "" - }() - } else { - return fmt.Errorf("only one concurrent shell allowed, but another shell is already connected from %s", peerAddress) - } - } - stopChan := make(chan bool) clientName, messageChan := ms.addClient(req.Name, peerAddress) |