diff options
| author | chrislu <chris.lu@gmail.com> | 2022-07-14 12:41:13 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-07-14 12:41:13 -0700 |
| commit | da8bab2b33f209a1b0c339e6250aa940d5c8572d (patch) | |
| tree | f2b715101388baf04ca4e769a3e5bdf3906dedf3 | |
| parent | 3e45d4bec497584ecace0417ed826cafd66af54b (diff) | |
| parent | fa610745133a344e761fe9efdde3395ea56e28ba (diff) | |
| download | seaweedfs-da8bab2b33f209a1b0c339e6250aa940d5c8572d.tar.xz seaweedfs-da8bab2b33f209a1b0c339e6250aa940d5c8572d.zip | |
Merge branch 'master' into messaging
| -rw-r--r-- | weed/filer/filer.go | 2 | ||||
| -rw-r--r-- | weed/filer/meta_aggregator.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go index 386d27898..a396280ff 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -79,7 +79,7 @@ func (f *Filer) MaybeBootstrapFromPeers(self pb.ServerAddress, existingNodes []* return } - glog.V(0).Infof("bootstrap from %v", earliestNode.Address) + glog.V(0).Infof("bootstrap from %v clientId:%d", earliestNode.Address, f.UniqueFileId) err = pb.FollowMetadata(pb.ServerAddress(earliestNode.Address), f.GrpcDialOption, "bootstrap", int32(f.UniqueFileId), "/", nil, 0, snapshotTime.UnixNano(), f.Signature, func(resp *filer_pb.SubscribeMetadataResponse) error { return Replay(f.Store, resp) diff --git a/weed/filer/meta_aggregator.go b/weed/filer/meta_aggregator.go index 11f0d9184..beade3201 100644 --- a/weed/filer/meta_aggregator.go +++ b/weed/filer/meta_aggregator.go @@ -185,7 +185,7 @@ func (ma *MetaAggregator) doSubscribeToOneFiler(f *Filer, self pb.ServerAddress, return nil } - glog.V(4).Infof("subscribing remote %s meta change: %v", peer, time.Unix(0, lastTsNs)) + glog.V(4).Infof("subscribing remote %s meta change: %v, clientId:%d", peer, time.Unix(0, lastTsNs), ma.filer.UniqueFileId) err = pb.WithFilerClient(true, peer, ma.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() |