gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/seaweedfs/seaweedfs

Browse Source
This commit is contained in:
chrislu
2024-06-22 08:30:18 -07:00
parent 622448b993 73baf82f05
commit 82ef66cc19
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed/shell/command_fs_verify.go
View File

@@ -163,9 +163,10 @@ func (c *commandFsVerify) verifyProcessMetadata(path string, wg *sync.WaitGroup)
Directory: message.NewParentPath, Directory: message.NewParentPath,
Name: message.NewEntry.Name, Name: message.NewEntry.Name,
}) })
if strings.HasSuffix(errReq.Error(), "no entry is found in filer store") { if errReq != nil {
return nil if strings.HasSuffix(errReq.Error(), "no entry is found in filer store") {
} else if errReq != nil { return nil
}
return errReq return errReq
} }
if entryResp.Entry.Attributes.Mtime == message.NewEntry.Attributes.Mtime && if entryResp.Entry.Attributes.Mtime == message.NewEntry.Attributes.Mtime &&

5
weed/topology/topology_event_handling.go
View File

@@ -90,6 +90,11 @@ func (t *Topology) UnRegisterDataNode(dn *DataNode) {
vl.SetVolumeUnavailable(dn, v.Id) vl.SetVolumeUnavailable(dn, v.Id)
} }
// unregister ec shards when volume server disconnected
for _, s := range dn.GetEcShards() {
t.UnRegisterEcShards(s, dn)
}
negativeUsages := dn.GetDiskUsages().negative() negativeUsages := dn.GetDiskUsages().negative()
dn.UpAdjustDiskUsageDelta(negativeUsages) dn.UpAdjustDiskUsageDelta(negativeUsages)
dn.DeltaUpdateVolumes([]storage.VolumeInfo{}, dn.GetVolumes()) dn.DeltaUpdateVolumes([]storage.VolumeInfo{}, dn.GetVolumes())