diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-06-29 12:36:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 12:36:28 -0700 |
| commit | 4ae9884a6e6375f81f709aa890458c8d4a61276d (patch) | |
| tree | 994bcb54888b93ca70f8368f3a581ee8c987bfad | |
| parent | b98556cff514c576f60e2282348e043fe273c360 (diff) | |
| parent | 2b5b37231b460936c6c67de7f27f33ecddd6c5ff (diff) | |
| download | seaweedfs-4ae9884a6e6375f81f709aa890458c8d4a61276d.tar.xz seaweedfs-4ae9884a6e6375f81f709aa890458c8d4a61276d.zip | |
Merge pull request #3254 from shichanglin5/fix_subscribe_meta
[Critical] Avoid synchronizing from scratch due to err
| -rw-r--r-- | weed/filer/meta_aggregator.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/filer/meta_aggregator.go b/weed/filer/meta_aggregator.go index fb96ee01b..1a805bde3 100644 --- a/weed/filer/meta_aggregator.go +++ b/weed/filer/meta_aggregator.go @@ -100,7 +100,8 @@ func (ma *MetaAggregator) loopSubscribeToOnefiler(f *Filer, self pb.ServerAddres } if err != nil { glog.V(0).Infof("subscribing remote %s meta change: %v", peer, err) - } else if lastTsNs < nextLastTsNs { + } + if lastTsNs < nextLastTsNs { lastTsNs = nextLastTsNs } time.Sleep(1733 * time.Millisecond) @@ -210,10 +211,9 @@ func (ma *MetaAggregator) doSubscribeToOneFiler(f *Filer, self pb.ServerAddress, if err := processEventFn(resp); err != nil { return fmt.Errorf("process %v: %v", resp, err) } - lastTsNs = resp.TsNs f.onMetadataChangeEvent(resp) - + lastTsNs = resp.TsNs } }) return lastTsNs, err |