From 5c0f01c0eb3a022abbaa4e6b1bed3254d5ab6506 Mon Sep 17 00:00:00 2001 From: chrislu Date: Thu, 7 Mar 2024 10:42:12 -0800 Subject: [PATCH] purge cluster id --- weed/server/filer_grpc_server_admin.go | 3 --- weed/shell/shell_liner.go | 19 ------------------- 2 files changed, 22 deletions(-) diff --git a/weed/server/filer_grpc_server_admin.go b/weed/server/filer_grpc_server_admin.go index 8a58e287c..b4caaf4e2 100644 --- a/weed/server/filer_grpc_server_admin.go +++ b/weed/server/filer_grpc_server_admin.go @@ -84,8 +84,6 @@ func (fs *FilerServer) Ping(ctx context.Context, req *filer_pb.PingRequest) (res func (fs *FilerServer) GetFilerConfiguration(ctx context.Context, req *filer_pb.GetFilerConfigurationRequest) (resp *filer_pb.GetFilerConfigurationResponse, err error) { - clusterId, _ := fs.filer.Store.KvGet(context.Background(), []byte("clusterId")) - t := &filer_pb.GetFilerConfigurationResponse{ Masters: fs.option.Masters.GetInstancesAsStrings(), Collection: fs.option.Collection, @@ -97,7 +95,6 @@ func (fs *FilerServer) GetFilerConfiguration(ctx context.Context, req *filer_pb. MetricsAddress: fs.metricsAddress, MetricsIntervalSec: int32(fs.metricsIntervalSec), Version: util.Version(), - ClusterId: string(clusterId), FilerGroup: fs.option.FilerGroup, } diff --git a/weed/shell/shell_liner.go b/weed/shell/shell_liner.go index 28672c17c..20add302a 100644 --- a/weed/shell/shell_liner.go +++ b/weed/shell/shell_liner.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/seaweedfs/seaweedfs/weed/cluster" "github.com/seaweedfs/seaweedfs/weed/pb" - "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/grace" @@ -74,24 +73,6 @@ func RunShell(options ShellOptions) { fmt.Println() } - if commandEnv.option.FilerAddress != "" { - commandEnv.WithFilerClient(false, func(filerClient filer_pb.SeaweedFilerClient) error { - resp, err := filerClient.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{}) - if err != nil { - return err - } - if resp.ClusterId != "" { - fmt.Printf(` ---- -Free Monitoring Data URL: -https://cloud.seaweedfs.com/ui/%s ---- -`, resp.ClusterId) - } - return nil - }) - } - for { cmd, err := line.Prompt("> ") if err != nil {