diff options
| author | chrislu <chris.lu@gmail.com> | 2022-09-10 14:18:28 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-09-10 14:18:28 -0700 |
| commit | 2c6b68b40effc0ed96439a5ba09242e463c303f3 (patch) | |
| tree | 3d6a48c795189ff271c8734273855be2ad75c548 | |
| parent | b64674018a618ea6a46137fd50fd687e8f72957f (diff) | |
| download | seaweedfs-2c6b68b40effc0ed96439a5ba09242e463c303f3.tar.xz seaweedfs-2c6b68b40effc0ed96439a5ba09242e463c303f3.zip | |
simplify a bit
| -rw-r--r-- | weed/command/filer_remote_sync.go | 2 | ||||
| -rw-r--r-- | weed/command/filer_remote_sync_dir.go | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/weed/command/filer_remote_sync.go b/weed/command/filer_remote_sync.go index f1b5ef01d..d22fd57f8 100644 --- a/weed/command/filer_remote_sync.go +++ b/weed/command/filer_remote_sync.go @@ -46,7 +46,7 @@ func init() { cmdFilerRemoteSynchronize.Run = runFilerRemoteSynchronize // break init cycle remoteSyncOptions.filerAddress = cmdFilerRemoteSynchronize.Flag.String("filer", "localhost:8888", "filer of the SeaweedFS cluster") remoteSyncOptions.dir = cmdFilerRemoteSynchronize.Flag.String("dir", "", "a mounted directory on filer") - remoteSyncOptions.storageClass = cmdFilerRemoteSynchronize.Flag.String("storageClass", "None", "override amz storage class, empty to delete") + remoteSyncOptions.storageClass = cmdFilerRemoteSynchronize.Flag.String("storageClass", "", "override amz storage class, empty to delete") remoteSyncOptions.readChunkFromFiler = cmdFilerRemoteSynchronize.Flag.Bool("filerProxy", false, "read file chunks from filer instead of volume servers") remoteSyncOptions.timeAgo = cmdFilerRemoteSynchronize.Flag.Duration("timeAgo", 0, "start time before now, skipping previous metadata changes. \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\"") remoteSyncOptions.clientId = util.RandomInt32() diff --git a/weed/command/filer_remote_sync_dir.go b/weed/command/filer_remote_sync_dir.go index 288b89a5a..a36145fca 100644 --- a/weed/command/filer_remote_sync_dir.go +++ b/weed/command/filer_remote_sync_dir.go @@ -37,11 +37,10 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour var lastLogTsNs = time.Now().UnixNano() processEventFnWithOffset := pb.AddOffsetFunc(func(resp *filer_pb.SubscribeMetadataResponse) error { - storageClass := *option.storageClass - if storageClass == "" { + if *option.storageClass == "" { delete(resp.EventNotification.NewEntry.Extended, s3_constants.AmzStorageClass) - } else if storageClass != "None" { - resp.EventNotification.NewEntry.Extended[s3_constants.AmzStorageClass] = []byte(storageClass) + } else { + resp.EventNotification.NewEntry.Extended[s3_constants.AmzStorageClass] = []byte(*option.storageClass) } processor.AddSyncJob(resp) return nil |