From 6fa3d0cc463fd866828ee071d295eab4eb725f4b Mon Sep 17 00:00:00 2001 From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> Date: Sat, 1 Oct 2022 14:33:47 +0500 Subject: [PATCH] fix delete key panic of remote sync dir (#3770) --- weed/command/filer_remote_sync_dir.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/weed/command/filer_remote_sync_dir.go b/weed/command/filer_remote_sync_dir.go index 5a9170582..5bc6ae300 100644 --- a/weed/command/filer_remote_sync_dir.go +++ b/weed/command/filer_remote_sync_dir.go @@ -37,11 +37,16 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour var lastLogTsNs = time.Now().UnixNano() processEventFnWithOffset := pb.AddOffsetFunc(func(resp *filer_pb.SubscribeMetadataResponse) error { - if *option.storageClass == "" { - delete(resp.EventNotification.NewEntry.Extended, s3_constants.AmzStorageClass) - } else { - resp.EventNotification.NewEntry.Extended[s3_constants.AmzStorageClass] = []byte(*option.storageClass) + if resp.EventNotification.NewEntry != nil { + if *option.storageClass == "" { + if _, ok := resp.EventNotification.NewEntry.Extended[s3_constants.AmzStorageClass]; ok { + delete(resp.EventNotification.NewEntry.Extended, s3_constants.AmzStorageClass) + } + } else { + resp.EventNotification.NewEntry.Extended[s3_constants.AmzStorageClass] = []byte(*option.storageClass) + } } + processor.AddSyncJob(resp) return nil }, 3*time.Second, func(counter int64, lastTsNs int64) error {