diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-07-16 23:39:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-16 23:39:27 -0700 |
| commit | 69553e5ba6d46ed924b0c3adc3f8d9666550999a (patch) | |
| tree | 7711c4d9fe1919d2c6eaa841779bcde6e24b0248 /weed/command | |
| parent | a524b4f485ce5aa2f234c742bd7d1e75386f569b (diff) | |
| download | seaweedfs-69553e5ba6d46ed924b0c3adc3f8d9666550999a.tar.xz seaweedfs-69553e5ba6d46ed924b0c3adc3f8d9666550999a.zip | |
convert error fromating to %w everywhere (#6995)
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/admin.go | 8 | ||||
| -rw-r--r-- | weed/command/filer_copy.go | 16 | ||||
| -rw-r--r-- | weed/command/filer_meta_backup.go | 4 | ||||
| -rw-r--r-- | weed/command/filer_remote_gateway_buckets.go | 4 | ||||
| -rw-r--r-- | weed/command/filer_remote_sync_dir.go | 4 | ||||
| -rw-r--r-- | weed/command/fix.go | 4 | ||||
| -rw-r--r-- | weed/command/master_follower.go | 2 | ||||
| -rw-r--r-- | weed/command/mount_std.go | 2 |
8 files changed, 22 insertions, 22 deletions
diff --git a/weed/command/admin.go b/weed/command/admin.go index 31d4ed087..6ac42330c 100644 --- a/weed/command/admin.go +++ b/weed/command/admin.go @@ -186,7 +186,7 @@ func startAdminServer(ctx context.Context, options AdminOptions) error { sessionKeyBytes := make([]byte, 32) _, err := rand.Read(sessionKeyBytes) if err != nil { - return fmt.Errorf("failed to generate session key: %v", err) + return fmt.Errorf("failed to generate session key: %w", err) } store := cookie.NewStore(sessionKeyBytes) r.Use(sessions.Sessions("admin-session", store)) @@ -234,7 +234,7 @@ func startAdminServer(ctx context.Context, options AdminOptions) error { // Start worker gRPC server for worker connections err = adminServer.StartWorkerGrpcServer(*options.port) if err != nil { - return fmt.Errorf("failed to start worker gRPC server: %v", err) + return fmt.Errorf("failed to start worker gRPC server: %w", err) } // Set up cleanup for gRPC server @@ -304,7 +304,7 @@ func startAdminServer(ctx context.Context, options AdminOptions) error { defer cancel() if err := server.Shutdown(shutdownCtx); err != nil { - return fmt.Errorf("admin server forced to shutdown: %v", err) + return fmt.Errorf("admin server forced to shutdown: %w", err) } return nil @@ -328,7 +328,7 @@ func expandHomeDir(path string) (string, error) { // Get current user currentUser, err := user.Current() if err != nil { - return "", fmt.Errorf("failed to get current user: %v", err) + return "", fmt.Errorf("failed to get current user: %w", err) } // Handle different tilde patterns diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index 547e46c4f..38e4eb7b9 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -268,7 +268,7 @@ func (worker *FileCopyWorker) doEachCopy(task FileCopyTask) error { } if shouldCopy, err := worker.checkExistingFileFirst(task, f); err != nil { - return fmt.Errorf("check existing file: %v", err) + return fmt.Errorf("check existing file: %w", err) } else if !shouldCopy { if *worker.options.verbose { fmt.Printf("skipping copied file: %v\n", f.Name()) @@ -395,7 +395,7 @@ func (worker *FileCopyWorker) uploadFileAsOne(task FileCopyTask, f *os.File) err } if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { - return fmt.Errorf("update fh: %v", err) + return fmt.Errorf("update fh: %w", err) } return nil }); err != nil { @@ -428,7 +428,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File, uploader, err := operation.NewUploader() if err != nil { - uploadError = fmt.Errorf("upload data %v: %v\n", fileName, err) + uploadError = fmt.Errorf("upload data %v: %w\n", fileName, err) return } @@ -456,7 +456,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File, ) if err != nil { - uploadError = fmt.Errorf("upload data %v: %v\n", fileName, err) + uploadError = fmt.Errorf("upload data %v: %w\n", fileName, err) return } if uploadResult.Error != "" { @@ -489,7 +489,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File, manifestedChunks, manifestErr := filer.MaybeManifestize(worker.saveDataAsChunk, chunks) if manifestErr != nil { - return fmt.Errorf("create manifest: %v", manifestErr) + return fmt.Errorf("create manifest: %w", manifestErr) } if err := pb.WithGrpcFilerClient(false, worker.signature, worker.filerAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { @@ -512,7 +512,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File, } if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { - return fmt.Errorf("update fh: %v", err) + return fmt.Errorf("update fh: %w", err) } return nil }); err != nil { @@ -546,7 +546,7 @@ func detectMimeType(f *os.File) string { func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, offset int64, tsNs int64) (chunk *filer_pb.FileChunk, err error) { uploader, uploaderErr := operation.NewUploader() if uploaderErr != nil { - return nil, fmt.Errorf("upload data: %v", uploaderErr) + return nil, fmt.Errorf("upload data: %w", uploaderErr) } finalFileId, uploadResult, flushErr, _ := uploader.UploadWithRetry( @@ -573,7 +573,7 @@ func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, off ) if flushErr != nil { - return nil, fmt.Errorf("upload data: %v", flushErr) + return nil, fmt.Errorf("upload data: %w", flushErr) } if uploadResult.Error != "" { return nil, fmt.Errorf("upload result: %v", uploadResult.Error) diff --git a/weed/command/filer_meta_backup.go b/weed/command/filer_meta_backup.go index e8c4680ba..f77f758ab 100644 --- a/weed/command/filer_meta_backup.go +++ b/weed/command/filer_meta_backup.go @@ -133,14 +133,14 @@ func (metaBackup *FilerMetaBackupOptions) traverseMetadata() (err error) { println("+", parentPath.Child(entry.Name)) if err := metaBackup.store.InsertEntry(context.Background(), filer.FromPbEntry(string(parentPath), entry)); err != nil { - saveErr = fmt.Errorf("insert entry error: %v\n", err) + saveErr = fmt.Errorf("insert entry error: %w\n", err) return } }) if traverseErr != nil { - return fmt.Errorf("traverse: %v", traverseErr) + return fmt.Errorf("traverse: %w", traverseErr) } return saveErr } diff --git a/weed/command/filer_remote_gateway_buckets.go b/weed/command/filer_remote_gateway_buckets.go index aa3869171..5c7e0ae21 100644 --- a/weed/command/filer_remote_gateway_buckets.go +++ b/weed/command/filer_remote_gateway_buckets.go @@ -23,7 +23,7 @@ func (option *RemoteGatewayOptions) followBucketUpdatesAndUploadToRemote(filerSo // read filer remote storage mount mappings if detectErr := option.collectRemoteStorageConf(); detectErr != nil { - return fmt.Errorf("read mount info: %v", detectErr) + return fmt.Errorf("read mount info: %w", detectErr) } eachEntryFunc, err := option.makeBucketedEventProcessor(filerSource) @@ -168,7 +168,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour if message.NewEntry.Name == filer.REMOTE_STORAGE_MOUNT_FILE { newMappings, readErr := filer.UnmarshalRemoteStorageMappings(message.NewEntry.Content) if readErr != nil { - return fmt.Errorf("unmarshal mappings: %v", readErr) + return fmt.Errorf("unmarshal mappings: %w", readErr) } option.mappings = newMappings } diff --git a/weed/command/filer_remote_sync_dir.go b/weed/command/filer_remote_sync_dir.go index c85ba03af..5011ca36e 100644 --- a/weed/command/filer_remote_sync_dir.go +++ b/weed/command/filer_remote_sync_dir.go @@ -25,7 +25,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour // read filer remote storage mount mappings _, _, remoteStorageMountLocation, remoteStorage, detectErr := filer.DetectMountInfo(option.grpcDialOption, pb.ServerAddress(*option.filerAddress), mountedDir) if detectErr != nil { - return fmt.Errorf("read mount info: %v", detectErr) + return fmt.Errorf("read mount info: %w", detectErr) } eachEntryFunc, err := option.makeEventProcessor(remoteStorage, mountedDir, remoteStorageMountLocation, filerSource) @@ -99,7 +99,7 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem if message.NewEntry.Name == filer.REMOTE_STORAGE_MOUNT_FILE { mappings, readErr := filer.UnmarshalRemoteStorageMappings(message.NewEntry.Content) if readErr != nil { - return fmt.Errorf("unmarshal mappings: %v", readErr) + return fmt.Errorf("unmarshal mappings: %w", readErr) } if remoteLoc, found := mappings.Mappings[mountedDir]; found { if remoteStorageMountLocation.Bucket != remoteLoc.Bucket || remoteStorageMountLocation.Path != remoteLoc.Path { diff --git a/weed/command/fix.go b/weed/command/fix.go index e0cbc58a4..2b7b425f3 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -170,7 +170,7 @@ func doFixOneVolume(basepath string, baseFileName string, collection string, vol } if err := storage.ScanVolumeFile(basepath, collection, vid, storage.NeedleMapInMemory, scanner); err != nil { - err := fmt.Errorf("scan .dat File: %v", err) + err := fmt.Errorf("scan .dat File: %w", err) if *fixIgnoreError { glog.Error(err) } else { @@ -179,7 +179,7 @@ func doFixOneVolume(basepath string, baseFileName string, collection string, vol } if err := SaveToIdx(scanner, indexFileName); err != nil { - err := fmt.Errorf("save to .idx File: %v", err) + err := fmt.Errorf("save to .idx File: %w", err) if *fixIgnoreError { glog.Error(err) } else { diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index 43707946d..55b046092 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -92,7 +92,7 @@ func startMasterFollower(masterOptions MasterOptions) { err = pb.WithOneOfGrpcMasterClients(false, masters, grpcDialOption, func(client master_pb.SeaweedClient) error { resp, err := client.GetMasterConfiguration(context.Background(), &master_pb.GetMasterConfigurationRequest{}) if err != nil { - return fmt.Errorf("get master grpc address %v configuration: %v", masters, err) + return fmt.Errorf("get master grpc address %v configuration: %w", masters, err) } masterOptions.defaultReplication = &resp.DefaultReplication masterOptions.volumeSizeLimitMB = aws.Uint(uint(resp.VolumeSizeLimitMB)) diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 677dca793..588d38ce4 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -78,7 +78,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { err = pb.WithOneOfGrpcFilerClients(false, filerAddresses, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { resp, err := client.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{}) if err != nil { - return fmt.Errorf("get filer grpc address %v configuration: %v", filerAddresses, err) + return fmt.Errorf("get filer grpc address %v configuration: %w", filerAddresses, err) } cipher = resp.Cipher return nil |
