Skip to content

Commit 6d5295b

Browse files
jiukerguozhi.li
andauthored
Wrap all error (#1061)
* wrap error。 Co-authored-by: guozhi.li <guozhi.li@daocloud.io>
1 parent 8500d4b commit 6d5295b

File tree

14 files changed

+32
-32
lines changed

14 files changed

+32
-32
lines changed

controllers/reconcile_cli.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (r *RabbitmqClusterReconciler) runEnableFeatureFlagsCommand(ctx context.Con
7474
msg := "failed to enable all feature flags on pod"
7575
logger.Error(err, msg, "pod", podName, "command", cmd, "stdout", stdout, "stderr", stderr)
7676
r.Recorder.Event(rmq, corev1.EventTypeWarning, "FailedReconcile", fmt.Sprintf("%s %s", msg, podName))
77-
return fmt.Errorf("%s %s: %v", msg, podName, err)
77+
return fmt.Errorf("%s %s: %w", msg, podName, err)
7878
}
7979
logger.Info("successfully enabled all feature flags")
8080
return r.deleteAnnotation(ctx, sts, stsCreateAnnotation)
@@ -95,7 +95,7 @@ func (r *RabbitmqClusterReconciler) runSetPluginsCommand(ctx context.Context, rm
9595
msg := "failed to set plugins on pod"
9696
logger.Error(err, msg, "pod", podName, "command", cmd, "stdout", stdout, "stderr", stderr)
9797
r.Recorder.Event(rmq, corev1.EventTypeWarning, "FailedReconcile", fmt.Sprintf("%s %s", msg, podName))
98-
return fmt.Errorf("%s %s: %v", msg, podName, err)
98+
return fmt.Errorf("%s %s: %w", msg, podName, err)
9999
}
100100
}
101101
logger.Info("successfully set plugins")
@@ -111,7 +111,7 @@ func (r *RabbitmqClusterReconciler) runQueueRebalanceCommand(ctx context.Context
111111
msg := "failed to run queue rebalance on pod"
112112
logger.Error(err, msg, "pod", podName, "command", cmd, "stdout", stdout, "stderr", stderr)
113113
r.Recorder.Event(rmq, corev1.EventTypeWarning, "FailedReconcile", fmt.Sprintf("%s %s", msg, podName))
114-
return fmt.Errorf("%s %s: %v", msg, podName, err)
114+
return fmt.Errorf("%s %s: %w", msg, podName, err)
115115
}
116116
return r.deleteAnnotation(ctx, rmq, queueRebalanceAnnotation)
117117
}

controllers/reconcile_finalizer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ func (r *RabbitmqClusterReconciler) prepareForDeletion(ctx context.Context, rabb
5353
}
5454
// Add label on all Pods to be picked up in pre-stop hook via Downward API
5555
if err := r.addRabbitmqDeletionLabel(ctx, rabbitmqCluster); err != nil {
56-
return fmt.Errorf("failed to add deletion markers to RabbitmqCluster Pods: %s", err.Error())
56+
return fmt.Errorf("failed to add deletion markers to RabbitmqCluster Pods: %w", err)
5757
}
5858
// Delete StatefulSet immediately after changing pod labels to minimize risk of them respawning.
5959
// There is a window where the StatefulSet could respawn Pods without the deletion label in this order.
6060
// But we can't delete it before because the DownwardAPI doesn't update once a Pod enters Terminating.
6161
// Addressing #648: if both rabbitmqCluster and the statefulSet returned by r.Get() are stale (and match each other),
6262
// setting the stale statefulSet's uid in the precondition can avoid mis-deleting any currently running statefulSet sharing the same name.
6363
if err := r.Client.Delete(ctx, sts, &client.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &uid}}); client.IgnoreNotFound(err) != nil {
64-
return fmt.Errorf("cannot delete StatefulSet: %s", err.Error())
64+
return fmt.Errorf("cannot delete StatefulSet: %w", err)
6565
}
6666

6767
return nil
@@ -95,7 +95,7 @@ func (r *RabbitmqClusterReconciler) addRabbitmqDeletionLabel(ctx context.Context
9595
pod := &pods.Items[i]
9696
pod.Labels[resource.DeletionMarker] = "true"
9797
if err := r.Client.Update(ctx, pod); client.IgnoreNotFound(err) != nil {
98-
return fmt.Errorf("cannot Update Pod %s in Namespace %s: %s", pod.Name, pod.Namespace, err.Error())
98+
return fmt.Errorf("cannot Update Pod %s in Namespace %s: %w", pod.Name, pod.Namespace, err)
9999
}
100100
}
101101

controllers/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (r *RabbitmqClusterReconciler) statefulSetUID(ctx context.Context, rmq *rab
7373
var sts *appsv1.StatefulSet
7474
var ref *metav1.OwnerReference
7575
if sts, err = r.statefulSet(ctx, rmq); err != nil {
76-
return "", fmt.Errorf("failed to get statefulSet: %s", err.Error())
76+
return "", fmt.Errorf("failed to get statefulSet: %w", err)
7777
}
7878
if ref = metav1.GetControllerOf(sts); ref == nil {
7979
return "", fmt.Errorf("failed to get controller reference for statefulSet %s", sts.GetName())

internal/resource/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func (builder *ServerConfigMapBuilder) Update(object client.Object) error {
240240
updateProperty(configMap.Data, "rabbitmq-env.conf", rmqProperties.EnvConfig)
241241

242242
if err := controllerutil.SetControllerReference(builder.Instance, configMap, builder.Scheme); err != nil {
243-
return fmt.Errorf("failed setting controller reference: %v", err)
243+
return fmt.Errorf("failed setting controller reference: %w", err)
244244
}
245245

246246
return nil

internal/resource/default_user_secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (builder *DefaultUserSecretBuilder) Update(object client.Object) error {
8989
builder.updatePorts(secret)
9090

9191
if err := controllerutil.SetControllerReference(builder.Instance, secret, builder.Scheme); err != nil {
92-
return fmt.Errorf("failed setting controller reference: %v", err)
92+
return fmt.Errorf("failed setting controller reference: %w", err)
9393
}
9494

9595
return nil

internal/resource/erlang_cookie.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (builder *ErlangCookieBuilder) Update(object client.Object) error {
6262
secret.Annotations = metadata.ReconcileAndFilterAnnotations(secret.GetAnnotations(), builder.Instance.Annotations)
6363

6464
if err := controllerutil.SetControllerReference(builder.Instance, secret, builder.Scheme); err != nil {
65-
return fmt.Errorf("failed setting controller reference: %v", err)
65+
return fmt.Errorf("failed setting controller reference: %w", err)
6666
}
6767

6868
return nil

internal/resource/headless_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (builder *HeadlessServiceBuilder) Update(object client.Object) error {
7373
}
7474

7575
if err := controllerutil.SetControllerReference(builder.Instance, service, builder.Scheme); err != nil {
76-
return fmt.Errorf("failed setting controller reference: %v", err)
76+
return fmt.Errorf("failed setting controller reference: %w", err)
7777
}
7878

7979
return nil

internal/resource/rabbitmq_plugins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (builder *RabbitmqPluginsConfigMapBuilder) Update(object client.Object) err
5757
configMap.Data["enabled_plugins"] = desiredPluginsAsString(builder.Instance.Spec.Rabbitmq.AdditionalPlugins)
5858

5959
if err := controllerutil.SetControllerReference(builder.Instance, configMap, builder.Scheme); err != nil {
60-
return fmt.Errorf("failed setting controller reference: %v", err)
60+
return fmt.Errorf("failed setting controller reference: %w", err)
6161
}
6262
return nil
6363
}

internal/resource/role.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (builder *RoleBuilder) Update(object client.Object) error {
6363
}
6464

6565
if err := controllerutil.SetControllerReference(builder.Instance, role, builder.Scheme); err != nil {
66-
return fmt.Errorf("failed setting controller reference: %v", err)
66+
return fmt.Errorf("failed setting controller reference: %w", err)
6767
}
6868
return nil
6969
}

internal/resource/role_binding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (builder *RoleBindingBuilder) Update(object client.Object) error {
5353
}
5454

5555
if err := controllerutil.SetControllerReference(builder.Instance, roleBinding, builder.Scheme); err != nil {
56-
return fmt.Errorf("failed setting controller reference: %v", err)
56+
return fmt.Errorf("failed setting controller reference: %w", err)
5757
}
5858
return nil
5959
}

0 commit comments

Comments
 (0)