diff options
| author | chrislu <chris.lu@gmail.com> | 2025-06-16 22:05:06 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2025-06-16 22:05:06 -0700 |
| commit | 96632a34b1075f7bbe8dcf89f5532ccf6587e484 (patch) | |
| tree | 06ec4b21c5b8f3e3c85a0f29c65af31b440e64af /weed/server | |
| parent | 11f37cd9f2987a44dbd3e5f0388eee7ed6f76264 (diff) | |
| download | seaweedfs-96632a34b1075f7bbe8dcf89f5532ccf6587e484.tar.xz seaweedfs-96632a34b1075f7bbe8dcf89f5532ccf6587e484.zip | |
add version to volume proto
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server_assign.go | 6 | ||||
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 1 | ||||
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_grpc_copy.go | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/weed/server/master_grpc_server_assign.go b/weed/server/master_grpc_server_assign.go index 4820de6a2..9a5199291 100644 --- a/weed/server/master_grpc_server_assign.go +++ b/weed/server/master_grpc_server_assign.go @@ -3,11 +3,12 @@ package weed_server import ( "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" - "github.com/seaweedfs/seaweedfs/weed/stats" "strings" "time" + "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/stats" + "github.com/seaweedfs/raft" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" @@ -69,6 +70,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest Rack: req.Rack, DataNode: req.DataNode, MemoryMapMaxSizeMb: req.MemoryMapMaxSizeMb, + Version: uint32(needle.CurrentVersion), } if !ms.Topo.DataCenterExists(option.DataCenter) { diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index 3a383e259..a1a52ccb3 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -343,6 +343,7 @@ func (ms *MasterServer) VolumeGrow(ctx context.Context, req *master_pb.VolumeGro Rack: req.Rack, DataNode: req.DataNode, MemoryMapMaxSizeMb: req.MemoryMapMaxSizeMb, + Version: uint32(needle.CurrentVersion), } volumeGrowRequest := topology.VolumeGrowRequest{ Option: &volumeGrowOption, diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index 250b3168b..4cca5277e 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -3,11 +3,12 @@ package weed_server import ( "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/util/version" "math/rand/v2" "net/http" "strconv" + "github.com/seaweedfs/seaweedfs/weed/util/version" + "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" @@ -176,6 +177,7 @@ func (ms *MasterServer) getVolumeGrowOption(r *http.Request) (*topology.VolumeGr Rack: r.FormValue("rack"), DataNode: r.FormValue("dataNode"), MemoryMapMaxSizeMb: memoryMapMaxSizeMb, + Version: uint32(needle.CurrentVersion), } return volumeGrowOption, nil } diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go index d34a74f55..4fd951927 100644 --- a/weed/server/volume_grpc_copy.go +++ b/weed/server/volume_grpc_copy.go @@ -310,6 +310,7 @@ func (vs *VolumeServer) ReadVolumeFileStatus(ctx context.Context, req *volume_se resp.Collection = v.Collection resp.DiskType = string(v.DiskType()) resp.VolumeInfo = v.GetVolumeInfo() + resp.Version = uint32(v.Version()) return resp, nil } |