lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-06-28 15:41:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix panic 5435 (#5436)

Browse Source
This commit is contained in:
Konstantin Lebedev 2024-03-29 04:17:59 +05:00 committed by GitHub
parent 6aa804b368
commit df40908e57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
weed/server/master_grpc_server_assign.go
View File

@ -97,6 +97,9 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest
continue continue
} }
dn := dnList.Head() dn := dnList.Head()
if dn == nil {
continue
}
var replicas []*master_pb.Location var replicas []*master_pb.Location
for _, r := range dnList.Rest() { for _, r := range dnList.Rest() {
replicas = append(replicas, &master_pb.Location{ replicas = append(replicas, &master_pb.Location{

4
weed/server/master_server_handlers.go
View File

@ -149,7 +149,9 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request)
} else { } else {
ms.maybeAddJwtAuthorization(w, fid, true) ms.maybeAddJwtAuthorization(w, fid, true)
dn := dnList.Head() dn := dnList.Head()
if dn == nil {
continue
}
writeJsonQuiet(w, r, http.StatusOK, operation.AssignResult{Fid: fid, Url: dn.Url(), PublicUrl: dn.PublicUrl, Count: count}) writeJsonQuiet(w, r, http.StatusOK, operation.AssignResult{Fid: fid, Url: dn.Url(), PublicUrl: dn.PublicUrl, Count: count})
return return
} }

2
weed/topology/volume_layout.go
View File

@ -301,7 +301,7 @@ func (vl *VolumeLayout) PickForWrite(count uint64, option *VolumeGrowOption) (vi
if float64(info.Size) > float64(vl.volumeSizeLimit)*option.Threshold() { if float64(info.Size) > float64(vl.volumeSizeLimit)*option.Threshold() {
shouldGrow = true shouldGrow = true
} }
return vid, count, locationList, shouldGrow, nil return vid, count, locationList.Copy(), shouldGrow, nil
} }
return 0, 0, nil, shouldGrow, errors.New("Strangely vid " + vid.String() + " is on no machine!") return 0, 0, nil, shouldGrow, errors.New("Strangely vid " + vid.String() + " is on no machine!")
} }

3
weed/topology/volume_location_list.go
View File

@ -28,6 +28,9 @@ func (dnll *VolumeLocationList) Copy() *VolumeLocationList {
func (dnll *VolumeLocationList) Head() *DataNode { func (dnll *VolumeLocationList) Head() *DataNode {
//mark first node as master volume //mark first node as master volume
if dnll.Length() == 0 {
return nil
}
return dnll.list[0] return dnll.list[0]
} }