Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

adjust error handling 

fix https://github.com/seaweedfs/seaweedfs/issues/5677
pull/5693/head
chrislu 6 months ago
parent
e9cee59c8c
commit
a829f36d17
4 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      weed/command/filer_backup.go
  2. 2
      weed/command/filer_meta_backup.go
  3. 2
      weed/command/filer_remote_gateway_buckets.go
  4. 2
      weed/command/filer_remote_sync_dir.go

2
weed/command/filer_backup.go
View File

@ -158,7 +158,7 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti
DirectoriesToWatch: nil, DirectoriesToWatch: nil,
StartTsNs: startFrom.UnixNano(), StartTsNs: startFrom.UnixNano(),
StopTsNs: 0, StopTsNs: 0,
EventErrorType: pb.TrivialOnError,
EventErrorType: pb.RetryForeverOnError,
} }
return pb.FollowMetadata(sourceFiler, grpcDialOption, metadataFollowOption, processEventFnWithOffset) return pb.FollowMetadata(sourceFiler, grpcDialOption, metadataFollowOption, processEventFnWithOffset)

2
weed/command/filer_meta_backup.go
View File

@ -207,7 +207,7 @@ func (metaBackup *FilerMetaBackupOptions) streamMetadataBackup() error {
DirectoriesToWatch: nil, DirectoriesToWatch: nil,
StartTsNs: startTime.UnixNano(), StartTsNs: startTime.UnixNano(),
StopTsNs: 0, StopTsNs: 0,
EventErrorType: pb.TrivialOnError,
EventErrorType: pb.RetryForeverOnError,
} }
return pb.FollowMetadata(pb.ServerAddress(*metaBackup.filerAddress), metaBackup.grpcDialOption, metadataFollowOption, processEventFnWithOffset) return pb.FollowMetadata(pb.ServerAddress(*metaBackup.filerAddress), metaBackup.grpcDialOption, metadataFollowOption, processEventFnWithOffset)

2
weed/command/filer_remote_gateway_buckets.go
View File

@ -60,7 +60,7 @@ func (option *RemoteGatewayOptions) followBucketUpdatesAndUploadToRemote(filerSo
DirectoriesToWatch: nil, DirectoriesToWatch: nil,
StartTsNs: lastOffsetTs.UnixNano(), StartTsNs: lastOffsetTs.UnixNano(),
StopTsNs: 0, StopTsNs: 0,
EventErrorType: pb.TrivialOnError,
EventErrorType: pb.RetryForeverOnError,
} }
return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset) return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset)

2
weed/command/filer_remote_sync_dir.go
View File

@ -74,7 +74,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour
DirectoriesToWatch: nil, DirectoriesToWatch: nil,
StartTsNs: lastOffsetTs.UnixNano(), StartTsNs: lastOffsetTs.UnixNano(),
StopTsNs: 0, StopTsNs: 0,
EventErrorType: pb.TrivialOnError,
EventErrorType: pb.RetryForeverOnError,
} }
return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset) return pb.FollowMetadata(pb.ServerAddress(*option.filerAddress), option.grpcDialOption, metadataFollowOption, processEventFnWithOffset)

Write Preview
Loading…
Cancel
Save