From 5a7c40510f849f89b9aa72dcbc80b86a48ae4382 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 15 Aug 2021 20:07:13 -0700 Subject: [PATCH] format output --- weed/command/filer_remote_sync.go | 6 ++++++ weed/remote_storage/remote_storage.go | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/weed/command/filer_remote_sync.go b/weed/command/filer_remote_sync.go index a9bf1d4e1..4ee34854b 100644 --- a/weed/command/filer_remote_sync.go +++ b/weed/command/filer_remote_sync.go @@ -146,8 +146,10 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour } dest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(message.NewParentPath, message.NewEntry.Name), remoteStorageMountLocation) if message.NewEntry.IsDirectory { + glog.V(0).Infof("mkdir %s", remote_storage.FormatLocation(dest)) return client.WriteDirectory(dest, message.NewEntry) } + glog.V(0).Infof("create %s", remote_storage.FormatLocation(dest)) reader := filer.NewFileReader(filerSource, message.NewEntry) remoteEntry, writeErr := client.WriteFile(dest, message.NewEntry, reader) if writeErr != nil { @@ -158,6 +160,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour if message.OldEntry != nil && message.NewEntry == nil { glog.V(2).Infof("delete: %+v", resp) dest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(resp.Directory, message.OldEntry.Name), remoteStorageMountLocation) + glog.V(0).Infof("delete %s", remote_storage.FormatLocation(dest)) return client.DeleteFile(dest) } if message.OldEntry != nil && message.NewEntry != nil { @@ -173,14 +176,17 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour if resp.Directory == message.NewParentPath && message.OldEntry.Name == message.NewEntry.Name { if filer.IsSameData(message.OldEntry, message.NewEntry) { glog.V(2).Infof("update meta: %+v", resp) + glog.V(0).Infof("delete %s", remote_storage.FormatLocation(dest)) return client.UpdateFileMetadata(dest, message.OldEntry, message.NewEntry) } } glog.V(2).Infof("update: %+v", resp) + glog.V(0).Infof("delete %s", remote_storage.FormatLocation(oldDest)) if err := client.DeleteFile(oldDest); err != nil { return err } reader := filer.NewFileReader(filerSource, message.NewEntry) + glog.V(0).Infof("create %s", remote_storage.FormatLocation(dest)) remoteEntry, writeErr := client.WriteFile(dest, message.NewEntry, reader) if writeErr != nil { return writeErr diff --git a/weed/remote_storage/remote_storage.go b/weed/remote_storage/remote_storage.go index eb260abe6..344120ade 100644 --- a/weed/remote_storage/remote_storage.go +++ b/weed/remote_storage/remote_storage.go @@ -27,6 +27,10 @@ func ParseLocation(remote string) (loc *filer_pb.RemoteStorageLocation) { return } +func FormatLocation(loc *filer_pb.RemoteStorageLocation) string { + return fmt.Sprintf("%s/%s%s", loc.Name, loc.Bucket, loc.Path) +} + type VisitFunc func(dir string, name string, isDirectory bool, remoteEntry *filer_pb.RemoteEntry) error type RemoteStorageClient interface {