convert error fromating to %w everywhere (#6995)
This commit is contained in:
@@ -52,7 +52,7 @@ func (c *commandRaftServerAdd) Do(args []string, commandEnv *CommandEnv, writer
|
||||
Voter: *serverVoter,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("raft add server: %v", err)
|
||||
return fmt.Errorf("raft add server: %w", err)
|
||||
}
|
||||
println("added server", *serverId)
|
||||
return nil
|
||||
|
||||
@@ -40,7 +40,7 @@ func (c *commandRaftClusterPs) Do(args []string, commandEnv *CommandEnv, writer
|
||||
err = commandEnv.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error {
|
||||
resp, err := client.RaftListClusterServers(context.Background(), &master_pb.RaftListClusterServersRequest{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("raft list cluster: %v", err)
|
||||
return fmt.Errorf("raft list cluster: %w", err)
|
||||
}
|
||||
fmt.Fprintf(writer, "the raft cluster has %d servers\n", len(resp.ClusterServers))
|
||||
for _, server := range resp.ClusterServers {
|
||||
|
||||
@@ -49,7 +49,7 @@ func (c *commandRaftServerRemove) Do(args []string, commandEnv *CommandEnv, writ
|
||||
Force: true,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("raft remove server: %v", err)
|
||||
return fmt.Errorf("raft remove server: %w", err)
|
||||
}
|
||||
println("removed server", *serverId)
|
||||
return nil
|
||||
|
||||
@@ -1049,7 +1049,7 @@ func EcBalance(commandEnv *CommandEnv, collections []string, dc string, ecReplic
|
||||
}
|
||||
|
||||
if err := ecb.balanceEcRacks(); err != nil {
|
||||
return fmt.Errorf("balance ec racks: %v", err)
|
||||
return fmt.Errorf("balance ec racks: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -121,21 +121,21 @@ func (c *commandEcEncode) Do(args []string, commandEnv *CommandEnv, writer io.Wr
|
||||
fmt.Printf("Collecting volume locations for %d volumes before EC encoding...\n", len(volumeIds))
|
||||
volumeLocationsMap, err := volumeLocations(commandEnv, volumeIds)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to collect volume locations before EC encoding: %v", err)
|
||||
return fmt.Errorf("failed to collect volume locations before EC encoding: %w", err)
|
||||
}
|
||||
|
||||
// encode all requested volumes...
|
||||
if err = doEcEncode(commandEnv, *collection, volumeIds, *maxParallelization); err != nil {
|
||||
return fmt.Errorf("ec encode for volumes %v: %v", volumeIds, err)
|
||||
return fmt.Errorf("ec encode for volumes %v: %w", volumeIds, err)
|
||||
}
|
||||
// ...re-balance ec shards...
|
||||
if err := EcBalance(commandEnv, balanceCollections, "", rp, *maxParallelization, *applyBalancing); err != nil {
|
||||
return fmt.Errorf("re-balance ec shards for collection(s) %v: %v", balanceCollections, err)
|
||||
return fmt.Errorf("re-balance ec shards for collection(s) %v: %w", balanceCollections, err)
|
||||
}
|
||||
// ...then delete original volumes using pre-collected locations.
|
||||
fmt.Printf("Deleting original volumes after EC encoding...\n")
|
||||
if err := doDeleteVolumesWithLocations(commandEnv, volumeIds, volumeLocationsMap, *maxParallelization); err != nil {
|
||||
return fmt.Errorf("delete original volumes after EC encoding: %v", err)
|
||||
return fmt.Errorf("delete original volumes after EC encoding: %w", err)
|
||||
}
|
||||
fmt.Printf("Successfully completed EC encoding for %d volumes\n", len(volumeIds))
|
||||
|
||||
@@ -161,7 +161,7 @@ func doEcEncode(commandEnv *CommandEnv, collection string, volumeIds []needle.Vo
|
||||
}
|
||||
locations, err := volumeLocations(commandEnv, volumeIds)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get volume locations for EC encoding: %v", err)
|
||||
return fmt.Errorf("failed to get volume locations for EC encoding: %w", err)
|
||||
}
|
||||
|
||||
// mark volumes as readonly
|
||||
|
||||
@@ -59,7 +59,7 @@ func findBrokerBalancer(commandEnv *CommandEnv) (brokerBalancer string, err erro
|
||||
Name: pub_balancer.LockBrokerBalancer,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("FindLockOwner: %v", err)
|
||||
return fmt.Errorf("FindLockOwner: %w", err)
|
||||
}
|
||||
brokerBalancer = resp.Owner
|
||||
return nil
|
||||
|
||||
@@ -104,7 +104,7 @@ func (c *commandRemoteCache) doComprehensiveSync(commandEnv *CommandEnv, writer
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to traverse remote storage: %v", err)
|
||||
return fmt.Errorf("failed to traverse remote storage: %w", err)
|
||||
}
|
||||
|
||||
fmt.Fprintf(writer, "Found %d files/directories in remote storage\n", len(remoteFiles))
|
||||
@@ -120,7 +120,7 @@ func (c *commandRemoteCache) doComprehensiveSync(commandEnv *CommandEnv, writer
|
||||
return true
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to traverse local directory: %v", err)
|
||||
return fmt.Errorf("failed to traverse local directory: %w", err)
|
||||
}
|
||||
fmt.Fprintf(writer, "Found %d files/directories in local storage\n", len(localFiles))
|
||||
} else {
|
||||
|
||||
@@ -66,7 +66,7 @@ func (c *commandRemoteMetaSync) Do(args []string, commandEnv *CommandEnv, writer
|
||||
|
||||
// pull metadata from remote
|
||||
if err = pullMetadata(commandEnv, writer, util.FullPath(localMountedDir), remoteStorageMountedLocation, util.FullPath(*dir), remoteStorageConf); err != nil {
|
||||
return fmt.Errorf("cache meta data: %v", err)
|
||||
return fmt.Errorf("cache meta data: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -78,12 +78,12 @@ func (c *commandRemoteMount) Do(args []string, commandEnv *CommandEnv, writer io
|
||||
|
||||
// sync metadata from remote
|
||||
if err = syncMetadata(commandEnv, writer, *dir, *nonEmpty, remoteConf, remoteStorageLocation); err != nil {
|
||||
return fmt.Errorf("pull metadata: %v", err)
|
||||
return fmt.Errorf("pull metadata: %w", err)
|
||||
}
|
||||
|
||||
// store a mount configuration in filer
|
||||
if err = filer.InsertMountMapping(commandEnv, *dir, remoteStorageLocation); err != nil {
|
||||
return fmt.Errorf("save mount mapping: %v", err)
|
||||
return fmt.Errorf("save mount mapping: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -161,7 +161,7 @@ func syncMetadata(commandEnv *CommandEnv, writer io.Writer, dir string, nonEmpty
|
||||
|
||||
// pull metadata from remote
|
||||
if err = pullMetadata(commandEnv, writer, util.FullPath(dir), remote, util.FullPath(dir), remoteConf); err != nil {
|
||||
return fmt.Errorf("cache metadata: %v", err)
|
||||
return fmt.Errorf("cache metadata: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -79,7 +79,7 @@ func (c *commandRemoteMountBuckets) Do(args []string, commandEnv *CommandEnv, wr
|
||||
|
||||
fillerBucketsPath, err := readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read filer buckets path: %v", err)
|
||||
return fmt.Errorf("read filer buckets path: %w", err)
|
||||
}
|
||||
|
||||
hasSuffixPattern, _ := regexp.Compile(".+-[0-9][0-9][0-9][0-9]")
|
||||
|
||||
@@ -75,7 +75,7 @@ func (c *commandRemoteUncache) Do(args []string, commandEnv *CommandEnv, writer
|
||||
|
||||
// pull content from remote
|
||||
if err = c.uncacheContentData(commandEnv, writer, util.FullPath(*dir), fileFiler); err != nil {
|
||||
return fmt.Errorf("uncache content data: %v", err)
|
||||
return fmt.Errorf("uncache content data: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -67,13 +67,13 @@ func (c *commandRemoteUnmount) Do(args []string, commandEnv *CommandEnv, writer
|
||||
// store a mount configuration in filer
|
||||
fmt.Fprintf(writer, "deleting mount for %s ...\n", *dir)
|
||||
if err = filer.DeleteMountMapping(commandEnv, *dir); err != nil {
|
||||
return fmt.Errorf("delete mount mapping: %v", err)
|
||||
return fmt.Errorf("delete mount mapping: %w", err)
|
||||
}
|
||||
|
||||
// purge mounted data
|
||||
fmt.Fprintf(writer, "purge %s ...\n", *dir)
|
||||
if err = c.purgeMountedData(commandEnv, *dir); err != nil {
|
||||
return fmt.Errorf("purge mounted data: %v", err)
|
||||
return fmt.Errorf("purge mounted data: %w", err)
|
||||
}
|
||||
|
||||
// reset remote sync offset in case the folder is mounted again
|
||||
|
||||
@@ -55,7 +55,7 @@ func (c *commandS3BucketCreate) Do(args []string, commandEnv *CommandEnv, writer
|
||||
|
||||
resp, err := client.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("get filer configuration: %v", err)
|
||||
return fmt.Errorf("get filer configuration: %w", err)
|
||||
}
|
||||
filerBucketsPath := resp.DirBuckets
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ func (c *commandS3BucketDelete) Do(args []string, commandEnv *CommandEnv, writer
|
||||
var filerBucketsPath string
|
||||
filerBucketsPath, err = readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read buckets: %v", err)
|
||||
return fmt.Errorf("read buckets: %w", err)
|
||||
}
|
||||
|
||||
// delete the collection directly first
|
||||
|
||||
@@ -54,7 +54,7 @@ func (c *commandS3BucketList) Do(args []string, commandEnv *CommandEnv, writer i
|
||||
var filerBucketsPath string
|
||||
filerBucketsPath, err = readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read buckets: %v", err)
|
||||
return fmt.Errorf("read buckets: %w", err)
|
||||
}
|
||||
|
||||
err = filer_pb.List(context.Background(), commandEnv, filerBucketsPath, "", func(entry *filer_pb.Entry, isLast bool) error {
|
||||
@@ -75,7 +75,7 @@ func (c *commandS3BucketList) Do(args []string, commandEnv *CommandEnv, writer i
|
||||
return nil
|
||||
}, "", false, math.MaxUint32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list buckets under %v: %v", filerBucketsPath, err)
|
||||
return fmt.Errorf("list buckets under %v: %w", filerBucketsPath, err)
|
||||
}
|
||||
|
||||
return err
|
||||
@@ -87,7 +87,7 @@ func readFilerBucketsPath(filerClient filer_pb.FilerClient) (filerBucketsPath st
|
||||
|
||||
resp, err := client.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("get filer configuration: %v", err)
|
||||
return fmt.Errorf("get filer configuration: %w", err)
|
||||
}
|
||||
filerBucketsPath = resp.DirBuckets
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ func (c *commandS3BucketQuota) Do(args []string, commandEnv *CommandEnv, writer
|
||||
|
||||
resp, err := client.GetFilerConfiguration(ctx, &filer_pb.GetFilerConfigurationRequest{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("get filer configuration: %v", err)
|
||||
return fmt.Errorf("get filer configuration: %w", err)
|
||||
}
|
||||
filerBucketsPath := resp.DirBuckets
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ func (c *commandS3BucketQuotaEnforce) Do(args []string, commandEnv *CommandEnv,
|
||||
var filerBucketsPath string
|
||||
filerBucketsPath, err = readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read buckets: %v", err)
|
||||
return fmt.Errorf("read buckets: %w", err)
|
||||
}
|
||||
|
||||
// read existing filer configuration
|
||||
@@ -81,7 +81,7 @@ func (c *commandS3BucketQuotaEnforce) Do(args []string, commandEnv *CommandEnv,
|
||||
return nil
|
||||
}, "", false, math.MaxUint32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list buckets under %v: %v", filerBucketsPath, err)
|
||||
return fmt.Errorf("list buckets under %v: %w", filerBucketsPath, err)
|
||||
}
|
||||
|
||||
// apply the configuration changes
|
||||
|
||||
@@ -51,7 +51,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer
|
||||
var filerBucketsPath string
|
||||
filerBucketsPath, err = readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read buckets: %v", err)
|
||||
return fmt.Errorf("read buckets: %w", err)
|
||||
}
|
||||
|
||||
var buckets []string
|
||||
@@ -60,7 +60,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer
|
||||
return nil
|
||||
}, "", false, math.MaxUint32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list buckets under %v: %v", filerBucketsPath, err)
|
||||
return fmt.Errorf("list buckets under %v: %w", filerBucketsPath, err)
|
||||
}
|
||||
|
||||
for _, bucket := range buckets {
|
||||
@@ -84,7 +84,7 @@ func (c *commandS3CleanUploads) cleanupUploads(commandEnv *CommandEnv, writer io
|
||||
return nil
|
||||
}, "", false, math.MaxUint32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list uploads under %v: %v", uploadsDir, err)
|
||||
return fmt.Errorf("list uploads under %v: %w", uploadsDir, err)
|
||||
}
|
||||
|
||||
var encodedJwt security.EncodedJwt
|
||||
|
||||
@@ -394,7 +394,7 @@ func writeToBuffer(client volume_server_pb.VolumeServer_CopyFileClient, buf *byt
|
||||
break
|
||||
}
|
||||
if receiveErr != nil {
|
||||
return fmt.Errorf("receiving: %v", receiveErr)
|
||||
return fmt.Errorf("receiving: %w", receiveErr)
|
||||
}
|
||||
buf.Write(resp.FileContent)
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ func (c *commandVolumeConfigureReplication) Do(args []string, commandEnv *Comman
|
||||
|
||||
replicaPlacement, err := super_block.NewReplicaPlacementFromString(*replicationString)
|
||||
if err != nil {
|
||||
return fmt.Errorf("replication format: %v", err)
|
||||
return fmt.Errorf("replication format: %w", err)
|
||||
}
|
||||
|
||||
// collect topology information
|
||||
|
||||
@@ -120,13 +120,13 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
|
||||
|
||||
c.bucketsPath, err = readFilerBucketsPath(commandEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read filer buckets path: %v", err)
|
||||
return fmt.Errorf("read filer buckets path: %w", err)
|
||||
}
|
||||
|
||||
// create a temp folder
|
||||
c.tempFolder, err = os.MkdirTemp(*tempPath, "sw_fsck")
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create temp folder: %v", err)
|
||||
return fmt.Errorf("failed to create temp folder: %w", err)
|
||||
}
|
||||
if *c.verbose {
|
||||
fmt.Fprintf(c.writer, "working directory: %s\n", c.tempFolder)
|
||||
@@ -136,11 +136,11 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
|
||||
// collect all volume id locations
|
||||
dataNodeVolumeIdToVInfo, err := c.collectVolumeIds()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to collect all volume locations: %v", err)
|
||||
return fmt.Errorf("failed to collect all volume locations: %w", err)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("read filer buckets path: %v", err)
|
||||
return fmt.Errorf("read filer buckets path: %w", err)
|
||||
}
|
||||
|
||||
var collectCutoffFromAtNs int64 = 0
|
||||
@@ -189,22 +189,22 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
|
||||
// collect all filer file ids and paths
|
||||
|
||||
if err = c.collectFilerFileIdAndPaths(dataNodeVolumeIdToVInfo, *purgeAbsent, collectModifyFromAtNs, collectCutoffFromAtNs); err != nil {
|
||||
return fmt.Errorf("collectFilerFileIdAndPaths: %v", err)
|
||||
return fmt.Errorf("collectFilerFileIdAndPaths: %w", err)
|
||||
}
|
||||
for dataNodeId, volumeIdToVInfo := range dataNodeVolumeIdToVInfo {
|
||||
// for each volume, check filer file ids
|
||||
if err = c.findFilerChunksMissingInVolumeServers(volumeIdToVInfo, dataNodeId, *applyPurging); err != nil {
|
||||
return fmt.Errorf("findFilerChunksMissingInVolumeServers: %v", err)
|
||||
return fmt.Errorf("findFilerChunksMissingInVolumeServers: %w", err)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// collect all filer file ids
|
||||
if err = c.collectFilerFileIdAndPaths(dataNodeVolumeIdToVInfo, false, 0, 0); err != nil {
|
||||
return fmt.Errorf("failed to collect file ids from filer: %v", err)
|
||||
return fmt.Errorf("failed to collect file ids from filer: %w", err)
|
||||
}
|
||||
// volume file ids subtract filer file ids
|
||||
if err = c.findExtraChunksInVolumeServers(dataNodeVolumeIdToVInfo, *applyPurging, uint64(collectModifyFromAtNs), uint64(collectCutoffFromAtNs)); err != nil {
|
||||
return fmt.Errorf("findExtraChunksInVolumeServers: %v", err)
|
||||
return fmt.Errorf("findExtraChunksInVolumeServers: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user