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

convert error fromating to %w everywhere (#6995)

Browse Source
This commit is contained in:
Chris Lu
2025-07-16 23:39:27 -07:00
committed by GitHub
parent a524b4f485
commit 69553e5ba6
174 changed files with 524 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
weed/worker/client.go
View File

@@ -83,7 +83,7 @@ func (c *GrpcAdminClient) Connect() error {
// Detect TLS support and create appropriate connection
conn, err := c.createConnection()
if err != nil {
return fmt.Errorf("failed to connect to admin server: %v", err)
return fmt.Errorf("failed to connect to admin server: %w", err)
}
c.conn = conn
@@ -94,7 +94,7 @@ func (c *GrpcAdminClient) Connect() error {
stream, err := c.client.WorkerStream(c.streamCtx)
if err != nil {
c.conn.Close()
return fmt.Errorf("failed to create worker stream: %v", err)
return fmt.Errorf("failed to create worker stream: %w", err)
}
c.stream = stream
@@ -116,7 +116,7 @@ func (c *GrpcAdminClient) createConnection() (*grpc.ClientConn, error) {
conn, err := pb.GrpcDial(ctx, c.adminAddress, false, c.dialOption)
if err != nil {
return nil, fmt.Errorf("failed to connect to admin server: %v", err)
return nil, fmt.Errorf("failed to connect to admin server: %w", err)
}
glog.Infof("Connected to admin server at %s", c.adminAddress)
@@ -273,7 +273,7 @@ func (c *GrpcAdminClient) reconnect() error {
// Create new connection
conn, err := c.createConnection()
if err != nil {
return fmt.Errorf("failed to create connection: %v", err)
return fmt.Errorf("failed to create connection: %w", err)
}
client := worker_pb.NewWorkerServiceClient(conn)
@@ -284,7 +284,7 @@ func (c *GrpcAdminClient) reconnect() error {
if err != nil {
conn.Close()
streamCancel()
return fmt.Errorf("failed to create stream: %v", err)
return fmt.Errorf("failed to create stream: %w", err)
}
// Update client state
@@ -440,7 +440,7 @@ func (c *GrpcAdminClient) SendHeartbeat(workerID string, status *types.WorkerSta
if !c.connected {
// Wait for reconnection for a short time
if err := c.waitForConnection(10 * time.Second); err != nil {
return fmt.Errorf("not connected to admin server: %v", err)
return fmt.Errorf("not connected to admin server: %w", err)
}
}
@@ -479,7 +479,7 @@ func (c *GrpcAdminClient) RequestTask(workerID string, capabilities []types.Task
if !c.connected {
// Wait for reconnection for a short time
if err := c.waitForConnection(5 * time.Second); err != nil {
return nil, fmt.Errorf("not connected to admin server: %v", err)
return nil, fmt.Errorf("not connected to admin server: %w", err)
}
}
@@ -545,7 +545,7 @@ func (c *GrpcAdminClient) CompleteTask(taskID string, success bool, errorMsg str
if !c.connected {
// Wait for reconnection for a short time
if err := c.waitForConnection(5 * time.Second); err != nil {
return fmt.Errorf("not connected to admin server: %v", err)
return fmt.Errorf("not connected to admin server: %w", err)
}
}
@@ -576,7 +576,7 @@ func (c *GrpcAdminClient) UpdateTaskProgress(taskID string, progress float64) er
if !c.connected {
// Wait for reconnection for a short time
if err := c.waitForConnection(5 * time.Second); err != nil {
return fmt.Errorf("not connected to admin server: %v", err)
return fmt.Errorf("not connected to admin server: %w", err)
}
}

10
weed/worker/tasks/balance/ui.go
View File

@@ -203,7 +203,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["imbalance_threshold"]; ok && len(values) > 0 {
threshold, err := strconv.ParseFloat(values[0], 64)
if err != nil {
return nil, fmt.Errorf("invalid imbalance threshold: %v", err)
return nil, fmt.Errorf("invalid imbalance threshold: %w", err)
}
if threshold < 0 || threshold > 1 {
return nil, fmt.Errorf("imbalance threshold must be between 0.0 and 1.0")
@@ -215,7 +215,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["scan_interval"]; ok && len(values) > 0 {
duration, err := time.ParseDuration(values[0])
if err != nil {
return nil, fmt.Errorf("invalid scan interval: %v", err)
return nil, fmt.Errorf("invalid scan interval: %w", err)
}
config.ScanIntervalSeconds = int(duration.Seconds())
}
@@ -224,7 +224,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["max_concurrent"]; ok && len(values) > 0 {
maxConcurrent, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid max concurrent: %v", err)
return nil, fmt.Errorf("invalid max concurrent: %w", err)
}
if maxConcurrent < 1 {
return nil, fmt.Errorf("max concurrent must be at least 1")
@@ -236,7 +236,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["min_server_count"]; ok && len(values) > 0 {
minServerCount, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid min server count: %v", err)
return nil, fmt.Errorf("invalid min server count: %w", err)
}
if minServerCount < 2 {
return nil, fmt.Errorf("min server count must be at least 2")
@@ -259,7 +259,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["min_interval"]; ok && len(values) > 0 {
duration, err := time.ParseDuration(values[0])
if err != nil {
return nil, fmt.Errorf("invalid min interval: %v", err)
return nil, fmt.Errorf("invalid min interval: %w", err)
}
config.MinIntervalSeconds = int(duration.Seconds())
}

10
weed/worker/tasks/erasure_coding/ui.go
View File

@@ -189,7 +189,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["volume_age_hours_seconds"]; ok && len(values) > 0 {
hours, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid volume age hours: %v", err)
return nil, fmt.Errorf("invalid volume age hours: %w", err)
}
config.VolumeAgeHoursSeconds = hours
}
@@ -198,7 +198,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["scan_interval_seconds"]; ok && len(values) > 0 {
interval, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid scan interval: %v", err)
return nil, fmt.Errorf("invalid scan interval: %w", err)
}
config.ScanIntervalSeconds = interval
}
@@ -207,7 +207,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["max_concurrent"]; ok && len(values) > 0 {
maxConcurrent, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid max concurrent: %v", err)
return nil, fmt.Errorf("invalid max concurrent: %w", err)
}
if maxConcurrent < 1 {
return nil, fmt.Errorf("max concurrent must be at least 1")
@@ -219,7 +219,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["shard_count"]; ok && len(values) > 0 {
shardCount, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid shard count: %v", err)
return nil, fmt.Errorf("invalid shard count: %w", err)
}
if shardCount < 1 {
return nil, fmt.Errorf("shard count must be at least 1")
@@ -231,7 +231,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
if values, ok := formData["parity_count"]; ok && len(values) > 0 {
parityCount, err := strconv.Atoi(values[0])
if err != nil {
return nil, fmt.Errorf("invalid parity count: %v", err)
return nil, fmt.Errorf("invalid parity count: %w", err)
}
if parityCount < 1 {
return nil, fmt.Errorf("parity count must be at least 1")

10
weed/worker/tasks/vacuum/ui.go
View File

@@ -180,7 +180,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
// Parse garbage threshold
if thresholdStr := formData["garbage_threshold"]; len(thresholdStr) > 0 {
if threshold, err := strconv.ParseFloat(thresholdStr[0], 64); err != nil {
return nil, fmt.Errorf("invalid garbage threshold: %v", err)
return nil, fmt.Errorf("invalid garbage threshold: %w", err)
} else if threshold < 0 || threshold > 1 {
return nil, fmt.Errorf("garbage threshold must be between 0.0 and 1.0")
} else {
@@ -191,7 +191,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
// Parse scan interval
if intervalStr := formData["scan_interval"]; len(intervalStr) > 0 {
if interval, err := time.ParseDuration(intervalStr[0]); err != nil {
return nil, fmt.Errorf("invalid scan interval: %v", err)
return nil, fmt.Errorf("invalid scan interval: %w", err)
} else {
config.ScanIntervalSeconds = durationToSeconds(interval)
}
@@ -200,7 +200,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
// Parse min volume age
if ageStr := formData["min_volume_age"]; len(ageStr) > 0 {
if age, err := time.ParseDuration(ageStr[0]); err != nil {
return nil, fmt.Errorf("invalid min volume age: %v", err)
return nil, fmt.Errorf("invalid min volume age: %w", err)
} else {
config.MinVolumeAgeSeconds = durationToSeconds(age)
}
@@ -209,7 +209,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
// Parse max concurrent
if concurrentStr := formData["max_concurrent"]; len(concurrentStr) > 0 {
if concurrent, err := strconv.Atoi(concurrentStr[0]); err != nil {
return nil, fmt.Errorf("invalid max concurrent: %v", err)
return nil, fmt.Errorf("invalid max concurrent: %w", err)
} else if concurrent < 1 {
return nil, fmt.Errorf("max concurrent must be at least 1")
} else {
@@ -220,7 +220,7 @@ func (ui *UIProvider) ParseConfigForm(formData map[string][]string) (interface{}
// Parse min interval
if intervalStr := formData["min_interval"]; len(intervalStr) > 0 {
if interval, err := time.ParseDuration(intervalStr[0]); err != nil {
return nil, fmt.Errorf("invalid min interval: %v", err)
return nil, fmt.Errorf("invalid min interval: %w", err)
} else {
config.MinIntervalSeconds = durationToSeconds(interval)
}

4
weed/worker/worker.go
View File

@@ -92,7 +92,7 @@ func (w *Worker) Start() error {
// Connect to admin server
if err := w.adminClient.Connect(); err != nil {
return fmt.Errorf("failed to connect to admin server: %v", err)
return fmt.Errorf("failed to connect to admin server: %w", err)
}
w.running = true
@@ -111,7 +111,7 @@ func (w *Worker) Start() error {
if err := w.adminClient.RegisterWorker(workerInfo); err != nil {
w.running = false
w.adminClient.Disconnect()
return fmt.Errorf("failed to register worker: %v", err)
return fmt.Errorf("failed to register worker: %w", err)
}
// Start worker loops