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

Merge pull request #3254 from shichanglin5/fix_subscribe_meta

Browse Source 
[Critical] Avoid synchronizing from scratch due to err
This commit is contained in:
Chris Lu
2022-06-29 12:36:28 -07:00
committed by GitHub
parent b98556cff5 2b5b37231b
commit 4ae9884a6e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/filer/meta_aggregator.go
View File

@@ -100,7 +100,8 @@ func (ma *MetaAggregator) loopSubscribeToOnefiler(f *Filer, self pb.ServerAddres
} }
if err != nil { if err != nil {
glog.V(0).Infof("subscribing remote %s meta change: %v", peer, err) glog.V(0).Infof("subscribing remote %s meta change: %v", peer, err)
} else if lastTsNs < nextLastTsNs { }
if lastTsNs < nextLastTsNs {
lastTsNs = nextLastTsNs lastTsNs = nextLastTsNs
} }
time.Sleep(1733 * time.Millisecond) time.Sleep(1733 * time.Millisecond)
@@ -210,10 +211,9 @@ func (ma *MetaAggregator) doSubscribeToOneFiler(f *Filer, self pb.ServerAddress,
if err := processEventFn(resp); err != nil { if err := processEventFn(resp); err != nil {
return fmt.Errorf("process %v: %v", resp, err) return fmt.Errorf("process %v: %v", resp, err)
} }
lastTsNs = resp.TsNs
f.onMetadataChangeEvent(resp) f.onMetadataChangeEvent(resp)
lastTsNs = resp.TsNs
} }
}) })
return lastTsNs, err return lastTsNs, err