aboutsummaryrefslogtreecommitdiff
path: root/weed/server/master_server_handlers_admin.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2024-06-14 11:42:05 -0700
committerchrislu <chris.lu@gmail.com>2024-06-14 11:42:05 -0700
commit32dbb6a2ceb86a44d7879bdb506ab759d59f056b (patch)
tree94c1d9cd5c086b437c4df2847b1a42b6432b535b /weed/server/master_server_handlers_admin.go
parent70b31e3a28b8169289bb9c55052355a3daacfd12 (diff)
parent8aae82dd71735df1cd915a47a9b9d453d393adf6 (diff)
downloadseaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.tar.xz
seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.zip
Merge branch 'master' into mq
Diffstat (limited to 'weed/server/master_server_handlers_admin.go')
-rw-r--r--weed/server/master_server_handlers_admin.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go
index 0d7131340..f40b819af 100644
--- a/weed/server/master_server_handlers_admin.go
+++ b/weed/server/master_server_handlers_admin.go
@@ -124,13 +124,13 @@ func (ms *MasterServer) redirectHandler(w http.ResponseWriter, r *http.Request)
func (ms *MasterServer) submitFromMasterServerHandler(w http.ResponseWriter, r *http.Request) {
if ms.Topo.IsLeader() {
- submitForClientHandler(w, r, func() pb.ServerAddress { return ms.option.Master }, ms.grpcDialOption)
+ submitForClientHandler(w, r, func(ctx context.Context) pb.ServerAddress { return ms.option.Master }, ms.grpcDialOption)
} else {
masterUrl, err := ms.Topo.Leader()
if err != nil {
writeJsonError(w, r, http.StatusInternalServerError, err)
} else {
- submitForClientHandler(w, r, func() pb.ServerAddress { return masterUrl }, ms.grpcDialOption)
+ submitForClientHandler(w, r, func(ctx context.Context) pb.ServerAddress { return masterUrl }, ms.grpcDialOption)
}
}
}