From 92a303c3ff9b5ed0b3b23e50231803a73bb8b4e5 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Thu, 21 Mar 2024 15:15:44 +0800 Subject: [PATCH] mcs: fix micro-service topo's display (#7956) (#7958) close tikv/pd#7957 Signed-off-by: husharp Co-authored-by: husharp --- pkg/mcs/scheduling/server/server.go | 4 +++- pkg/mcs/tso/server/server.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/mcs/scheduling/server/server.go b/pkg/mcs/scheduling/server/server.go index 738140612b8..47a7cf9962b 100644 --- a/pkg/mcs/scheduling/server/server.go +++ b/pkg/mcs/scheduling/server/server.go @@ -20,6 +20,7 @@ import ( "net/http" "os" "os/signal" + "path/filepath" "runtime" "strconv" "sync" @@ -413,7 +414,8 @@ func (s *Server) startServer() (err error) { // different service modes provided by the same pd-server binary bs.ServerInfoGauge.WithLabelValues(versioninfo.PDReleaseVersion, versioninfo.PDGitHash).Set(float64(time.Now().Unix())) bs.ServerMaxProcsGauge.Set(float64(runtime.GOMAXPROCS(0))) - deployPath, err := os.Executable() + execPath, err := os.Executable() + deployPath := filepath.Dir(execPath) if err != nil { deployPath = "" } diff --git a/pkg/mcs/tso/server/server.go b/pkg/mcs/tso/server/server.go index bac93ddfb6b..f5f46a29504 100644 --- a/pkg/mcs/tso/server/server.go +++ b/pkg/mcs/tso/server/server.go @@ -20,6 +20,7 @@ import ( "net/http" "os" "os/signal" + "path/filepath" "runtime" "strconv" "sync" @@ -368,7 +369,8 @@ func (s *Server) startServer() (err error) { s.serverLoopCtx, s.serverLoopCancel = context.WithCancel(s.Context()) legacySvcRootPath := endpoint.LegacyRootPath(s.clusterID) tsoSvcRootPath := endpoint.TSOSvcRootPath(s.clusterID) - deployPath, err := os.Executable() + execPath, err := os.Executable() + deployPath := filepath.Dir(execPath) if err != nil { deployPath = "" }