gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wrong parameter

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/pull/5102
This commit is contained in:
chrislu
2023-12-13 12:02:57 -08:00
parent 1397b1ca09
commit 915416a277
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/command/filer_remote_gateway_buckets.go
View File

@@ -224,7 +224,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour
if writeErr != nil { if writeErr != nil {
return writeErr return writeErr
} }
return updateLocalEntry(&remoteSyncOptions, message.NewParentPath, message.NewEntry, remoteEntry) return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry)
} }
if filer_pb.IsDelete(resp) { if filer_pb.IsDelete(resp) {
if resp.Directory == option.bucketsDir { if resp.Directory == option.bucketsDir {
@@ -288,7 +288,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour
if writeErr != nil { if writeErr != nil {
return writeErr return writeErr
} }
return updateLocalEntry(&remoteSyncOptions, message.NewParentPath, message.NewEntry, remoteEntry) return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry)
} }
} }
} }
@@ -325,7 +325,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour
if writeErr != nil { if writeErr != nil {
return writeErr return writeErr
} }
return updateLocalEntry(&remoteSyncOptions, message.NewParentPath, message.NewEntry, remoteEntry) return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry)
} }
} }

8
weed/command/filer_remote_sync_dir.go
View File

@@ -28,7 +28,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour
return fmt.Errorf("read mount info: %v", detectErr) return fmt.Errorf("read mount info: %v", detectErr)
} }
eachEntryFunc, err := makeEventProcessor(remoteStorage, mountedDir, remoteStorageMountLocation, filerSource) eachEntryFunc, err := option.makeEventProcessor(remoteStorage, mountedDir, remoteStorageMountLocation, filerSource)
if err != nil { if err != nil {
return err return err
} }
@@ -80,7 +80,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour
return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset) return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset)
} }
func makeEventProcessor(remoteStorage *remote_pb.RemoteConf, mountedDir string, remoteStorageMountLocation *remote_pb.RemoteStorageLocation, filerSource *source.FilerSource) (pb.ProcessMetadataFunc, error) { func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.RemoteConf, mountedDir string, remoteStorageMountLocation *remote_pb.RemoteStorageLocation, filerSource *source.FilerSource) (pb.ProcessMetadataFunc, error) {
client, err := remote_storage.GetRemoteStorage(remoteStorage) client, err := remote_storage.GetRemoteStorage(remoteStorage)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -152,7 +152,7 @@ func makeEventProcessor(remoteStorage *remote_pb.RemoteConf, mountedDir string,
if writeErr != nil { if writeErr != nil {
return writeErr return writeErr
} }
return updateLocalEntry(&remoteSyncOptions, message.NewParentPath, message.NewEntry, remoteEntry) return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry)
} }
if filer_pb.IsDelete(resp) { if filer_pb.IsDelete(resp) {
glog.V(2).Infof("delete: %+v", resp) glog.V(2).Infof("delete: %+v", resp)
@@ -191,7 +191,7 @@ func makeEventProcessor(remoteStorage *remote_pb.RemoteConf, mountedDir string,
if writeErr != nil { if writeErr != nil {
return writeErr return writeErr
} }
return updateLocalEntry(&remoteSyncOptions, message.NewParentPath, message.NewEntry, remoteEntry) return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry)
} }
return nil return nil