aboutsummaryrefslogtreecommitdiff
path: root/weed/command
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2021-08-31 23:26:26 -0700
committerChris Lu <chris.lu@gmail.com>2021-08-31 23:26:26 -0700
commit68ea99190f37e6a2934dd921cea7180c69380914 (patch)
tree6a859d4674f58447a943974d4ba8f72ff7a733ab /weed/command
parent43fd11278ef811856551904b531bcc91821d0c9f (diff)
downloadseaweedfs-68ea99190f37e6a2934dd921cea7180c69380914.tar.xz
seaweedfs-68ea99190f37e6a2934dd921cea7180c69380914.zip
add additionalPathPrefixes
Diffstat (limited to 'weed/command')
-rw-r--r--weed/command/filer_backup.go3
-rw-r--r--weed/command/filer_meta_backup.go3
-rw-r--r--weed/command/filer_meta_tail.go18
-rw-r--r--weed/command/filer_remote_sync.go3
-rw-r--r--weed/command/filer_sync.go3
5 files changed, 12 insertions, 18 deletions
diff --git a/weed/command/filer_backup.go b/weed/command/filer_backup.go
index 0c450181b..f0a4bd79b 100644
--- a/weed/command/filer_backup.go
+++ b/weed/command/filer_backup.go
@@ -112,7 +112,6 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti
return setOffset(grpcDialOption, sourceFiler, BackupKeyPrefix, int32(sinkId), lastTsNs)
})
- return pb.FollowMetadata(sourceFiler, grpcDialOption, "backup_"+dataSink.GetName(),
- sourcePath, startFrom.UnixNano(), 0, processEventFnWithOffset, false)
+ return pb.FollowMetadata(sourceFiler, grpcDialOption, "backup_"+dataSink.GetName(), sourcePath, nil, startFrom.UnixNano(), 0, processEventFnWithOffset, false)
}
diff --git a/weed/command/filer_meta_backup.go b/weed/command/filer_meta_backup.go
index 6fe323fba..ebc39beb1 100644
--- a/weed/command/filer_meta_backup.go
+++ b/weed/command/filer_meta_backup.go
@@ -195,8 +195,7 @@ func (metaBackup *FilerMetaBackupOptions) streamMetadataBackup() error {
return metaBackup.setOffset(lastTime)
})
- return pb.FollowMetadata(*metaBackup.filerAddress, metaBackup.grpcDialOption, "meta_backup",
- *metaBackup.filerDirectory, startTime.UnixNano(), 0, processEventFnWithOffset, false)
+ return pb.FollowMetadata(*metaBackup.filerAddress, metaBackup.grpcDialOption, "meta_backup", *metaBackup.filerDirectory, nil, startTime.UnixNano(), 0, processEventFnWithOffset, false)
}
diff --git a/weed/command/filer_meta_tail.go b/weed/command/filer_meta_tail.go
index 28c0db99b..3b30e2b6a 100644
--- a/weed/command/filer_meta_tail.go
+++ b/weed/command/filer_meta_tail.go
@@ -103,17 +103,15 @@ func runFilerMetaTail(cmd *Command, args []string) bool {
}
}
- tailErr := pb.FollowMetadata(*tailFiler, grpcDialOption, "tail",
- *tailTarget, time.Now().Add(-*tailStart).UnixNano(), 0,
- func(resp *filer_pb.SubscribeMetadataResponse) error {
- if !shouldPrint(resp) {
- return nil
- }
- if err := eachEntryFunc(resp); err != nil {
- return err
- }
+ tailErr := pb.FollowMetadata(*tailFiler, grpcDialOption, "tail", *tailTarget, nil, time.Now().Add(-*tailStart).UnixNano(), 0, func(resp *filer_pb.SubscribeMetadataResponse) error {
+ if !shouldPrint(resp) {
return nil
- }, false)
+ }
+ if err := eachEntryFunc(resp); err != nil {
+ return err
+ }
+ return nil
+ }, false)
if tailErr != nil {
fmt.Printf("tail %s: %v\n", *tailFiler, tailErr)
diff --git a/weed/command/filer_remote_sync.go b/weed/command/filer_remote_sync.go
index 8d2719660..fd6ed23b9 100644
--- a/weed/command/filer_remote_sync.go
+++ b/weed/command/filer_remote_sync.go
@@ -210,8 +210,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour
return setOffset(option.grpcDialOption, *option.filerAddress, RemoteSyncKeyPrefix, int32(dirHash), lastTsNs)
})
- return pb.FollowMetadata(*option.filerAddress, option.grpcDialOption,
- "filer.remote.sync", mountedDir, lastOffsetTs.UnixNano(), 0, processEventFnWithOffset, false)
+ return pb.FollowMetadata(*option.filerAddress, option.grpcDialOption, "filer.remote.sync", mountedDir, nil, lastOffsetTs.UnixNano(), 0, processEventFnWithOffset, false)
}
func toRemoteStorageLocation(mountDir, sourcePath util.FullPath, remoteMountLocation *remote_pb.RemoteStorageLocation) *remote_pb.RemoteStorageLocation {
diff --git a/weed/command/filer_sync.go b/weed/command/filer_sync.go
index 5440811dd..4ebb87f71 100644
--- a/weed/command/filer_sync.go
+++ b/weed/command/filer_sync.go
@@ -170,8 +170,7 @@ func doSubscribeFilerMetaChanges(grpcDialOption grpc.DialOption, sourceFiler, so
return setOffset(grpcDialOption, targetFiler, SyncKeyPrefix, sourceFilerSignature, lastTsNs)
})
- return pb.FollowMetadata(sourceFiler, grpcDialOption, "syncTo_"+targetFiler,
- sourcePath, sourceFilerOffsetTsNs, targetFilerSignature, processEventFnWithOffset, false)
+ return pb.FollowMetadata(sourceFiler, grpcDialOption, "syncTo_"+targetFiler, sourcePath, nil, sourceFilerOffsetTsNs, targetFilerSignature, processEventFnWithOffset, false)
}