aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2024-03-07 10:42:12 -0800
committerchrislu <chris.lu@gmail.com>2024-03-07 10:42:12 -0800
commit5c0f01c0eb3a022abbaa4e6b1bed3254d5ab6506 (patch)
tree47239e4d03f6518f52c6b1ac060f7eeb09a4900a
parent08330575034193ef79e5a10c6049e75ceaaa75b1 (diff)
downloadseaweedfs-5c0f01c0eb3a022abbaa4e6b1bed3254d5ab6506.tar.xz
seaweedfs-5c0f01c0eb3a022abbaa4e6b1bed3254d5ab6506.zip
purge cluster id
-rw-r--r--weed/server/filer_grpc_server_admin.go3
-rw-r--r--weed/shell/shell_liner.go19
2 files changed, 0 insertions, 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 {