Skip to content

Commit 4dd2dcf

Browse files
phuhung273phuhung273
committed
chore: remove unneeded logging before returning err
1 parent 7108536 commit 4dd2dcf

File tree

9 files changed

+15
-36
lines changed

9 files changed

+15
-36
lines changed

‎internal/runnable/grpc.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func GRPCServer(name string, srv *grpc.Server, port int) manager.Runnable {
3737
// Start listening.
3838
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
3939
if err != nil {
40-
log.Error(err, "gRPC server failed to listen")
41-
return err
40+
return fmt.Errorf("gRPC server failed to listen - %w", err)
4241
}
4342

4443
log.Info("gRPC server listening", "port", port)
@@ -59,8 +58,7 @@ func GRPCServer(name string, srv *grpc.Server, port int) manager.Runnable {
5958

6059
// Keep serving until terminated.
6160
if err := srv.Serve(lis); err != nil && err != grpc.ErrServerStopped {
62-
log.Error(err, "gRPC server failed")
63-
return err
61+
return fmt.Errorf("gRPC server failed - %w", err)
6462
}
6563
log.Info("gRPC server terminated")
6664
return nil

‎pkg/bbr/handlers/server.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
6161
return nil
6262
}
6363
if recvErr != nil {
64-
// This error occurs very frequently, though it doesn't seem to have any impact.
65-
// TODO Figure out if we can remove this noise.
66-
loggerVerbose.Error(recvErr, "Cannot receive stream request")
6764
return status.Errorf(codes.Unknown, "cannot receive stream request: %v", recvErr)
6865
}
6966

@@ -103,8 +100,6 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
103100
if err != nil {
104101
if logger.V(logutil.DEBUG).Enabled() {
105102
logger.V(logutil.DEBUG).Error(err, "Failed to process request", "request", req)
106-
} else {
107-
logger.V(logutil.DEFAULT).Error(err, "Failed to process request")
108103
}
109104
return status.Errorf(status.Code(err), "failed to handle request: %v", err)
110105
}
@@ -116,7 +111,6 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
116111
loggerVerbose.Info("Response generated")
117112
}
118113
if err := srv.Send(resp); err != nil {
119-
logger.V(logutil.DEFAULT).Error(err, "Send failed")
120114
return status.Errorf(codes.Unknown, "failed to send response back to Envoy: %v", err)
121115
}
122116
}

‎pkg/bbr/server/runserver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package server
1919
import (
2020
"context"
2121
"crypto/tls"
22+
"fmt"
2223

2324
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2425
"github.com/go-logr/logr"
@@ -54,8 +55,7 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable {
5455
if r.SecureServing {
5556
cert, err := tlsutil.CreateSelfSignedTLSCertificate(logger)
5657
if err != nil {
57-
logger.Error(err, "Failed to create self signed certificate")
58-
return err
58+
return fmt.Errorf("failed to create self signed certificate - %w", err)
5959
}
6060
creds := credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}})
6161
srv = grpc.NewServer(grpc.Creds(creds))

‎pkg/epp/controller/inferenceobjective_reconciler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controller
1818

1919
import (
2020
"context"
21+
"fmt"
2122

2223
"k8s.io/apimachinery/pkg/api/errors"
2324
ctrl "sigs.k8s.io/controller-runtime"
@@ -48,8 +49,7 @@ func (c *InferenceObjectiveReconciler) Reconcile(ctx context.Context, req ctrl.R
4849
notFound := false
4950
if err := c.Get(ctx, req.NamespacedName, infObjective); err != nil {
5051
if !errors.IsNotFound(err) {
51-
logger.Error(err, "Unable to get InferenceObjective")
52-
return ctrl.Result{}, err
52+
return ctrl.Result{}, fmt.Errorf("unable to get InferenceObjective - %w", err)
5353
}
5454
notFound = true
5555
}

‎pkg/epp/controller/inferencepool_reconciler.go‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
5656
obj = &v1alpha2.InferencePool{}
5757
default:
5858
// Handle unsupported groups gracefully.
59-
err := fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group)
60-
logger.Error(err, "Cannot reconcile InferencePool")
61-
return ctrl.Result{}, err
59+
return ctrl.Result{}, fmt.Errorf("cannot reconcile InferencePool - unsupported API group: %s", c.PoolGKNN.Group)
6260
}
6361

6462
// 2. Perform a single, generic fetch for the object.
@@ -68,8 +66,7 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
6866
c.Datastore.Clear()
6967
return ctrl.Result{}, nil
7068
}
71-
logger.Error(err, "Unable to get InferencePool")
72-
return ctrl.Result{}, err
69+
return ctrl.Result{}, fmt.Errorf("unable to get InferencePool - %w", err)
7370
}
7471

7572
// 3. Perform common checks using the client.Object interface.
@@ -90,16 +87,14 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
9087
var err error
9188
err = pool.ConvertTo(v1infPool)
9289
if err != nil {
93-
logger.Error(err, "Failed to convert XInferencePool to InferencePool")
94-
return ctrl.Result{}, err
90+
return ctrl.Result{}, fmt.Errorf("failed to convert XInferencePool to InferencePool - %w", err)
9591
}
9692
default:
9793
return ctrl.Result{}, fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group)
9894
}
9995

10096
if err := c.Datastore.PoolSet(ctx, c.Reader, v1infPool); err != nil {
101-
logger.Error(err, "Failed to update datastore")
102-
return ctrl.Result{}, err
97+
return ctrl.Result{}, fmt.Errorf("failed to update datastore - %w", err)
10398
}
10499

105100
return ctrl.Result{}, nil

‎pkg/epp/controller/pod_reconciler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controller
1818

1919
import (
2020
"context"
21+
"fmt"
2122

2223
"github.com/go-logr/logr"
2324
corev1 "k8s.io/api/core/v1"
@@ -55,8 +56,7 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
5556
c.Datastore.PodDelete(req.NamespacedName)
5657
return ctrl.Result{}, nil
5758
}
58-
logger.V(logutil.DEFAULT).Error(err, "Unable to get pod")
59-
return ctrl.Result{}, err
59+
return ctrl.Result{}, fmt.Errorf("unable to get pod - %w", err)
6060
}
6161

6262
c.updateDatastore(logger, pod)

‎pkg/epp/handlers/response.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package handlers
1919
import (
2020
"context"
2121
"encoding/json"
22+
"fmt"
2223
"strings"
2324

2425
configPb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -39,8 +40,7 @@ func (s *StreamingServer) HandleResponseBody(ctx context.Context, reqCtx *Reques
3940
logger := log.FromContext(ctx)
4041
responseBytes, err := json.Marshal(response)
4142
if err != nil {
42-
logger.V(logutil.DEFAULT).Error(err, "error marshalling responseBody")
43-
return reqCtx, err
43+
return reqCtx, fmt.Errorf("error marshalling responseBody - %w", err)
4444
}
4545
if response["usage"] != nil {
4646
usg := response["usage"].(map[string]any)

‎pkg/epp/handlers/server.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ func (s *StreamingServer) Process(srv extProcPb.ExternalProcessor_ProcessServer)
177177
return nil
178178
}
179179
if recvErr != nil {
180-
// This error occurs very frequently, though it doesn't seem to have any impact.
181-
// TODO Figure out if we can remove this noise.
182-
logger.V(logutil.DEFAULT).Error(err, "Cannot receive stream request")
183180
return status.Errorf(codes.Unknown, "cannot receive stream request: %v", err)
184181
}
185182

@@ -327,15 +324,12 @@ func (s *StreamingServer) Process(srv extProcPb.ExternalProcessor_ProcessServer)
327324
if err != nil {
328325
if logger.V(logutil.DEBUG).Enabled() {
329326
logger.V(logutil.DEBUG).Error(err, "Failed to process request", "request", req)
330-
} else {
331-
logger.V(logutil.DEFAULT).Error(err, "Failed to process request")
332327
}
333328
resp, err := buildErrResponse(err)
334329
if err != nil {
335330
return err
336331
}
337332
if err := srv.Send(resp); err != nil {
338-
logger.V(logutil.DEFAULT).Error(err, "Send failed")
339333
return status.Errorf(codes.Unknown, "failed to send response back to Envoy: %v", err)
340334
}
341335
return nil
@@ -355,7 +349,6 @@ func (r *RequestContext) updateStateAndSendIfNeeded(srv extProcPb.ExternalProces
355349
if r.RequestState == RequestReceived && r.reqHeaderResp != nil {
356350
loggerTrace.Info("Sending request header response", "obj", r.reqHeaderResp)
357351
if err := srv.Send(r.reqHeaderResp); err != nil {
358-
logger.V(logutil.DEFAULT).Error(err, "error sending response")
359352
return status.Errorf(codes.Unknown, "failed to send response back to Envoy: %v", err)
360353
}
361354
r.RequestState = HeaderRequestResponseComplete

‎pkg/epp/server/runserver.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable {
157157
cert, err = tlsutil.CreateSelfSignedTLSCertificate(logger)
158158
}
159159
if err != nil {
160-
logger.Error(err, "Failed to create self signed certificate")
161-
return err
160+
return fmt.Errorf("failed to create self signed certificate - %w", err)
162161
}
163162

164163
creds := credentials.NewTLS(&tls.Config{

0 commit comments

Comments
 (0)