Skip to content

Commit bc00e9f

Browse files
committed
chore: remove unneeded logging before returning err
1 parent 8b154ba commit bc00e9f

File tree

11 files changed

+0
-38
lines changed

11 files changed

+0
-38
lines changed

cmd/bbr/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ func run() error {
7878
// Init runtime.
7979
cfg, err := ctrl.GetConfig()
8080
if err != nil {
81-
setupLog.Error(err, "Failed to get rest config")
8281
return err
8382
}
8483

@@ -111,14 +110,12 @@ func run() error {
111110

112111
// Register ext-proc server.
113112
if err := mgr.Add(serverRunner.AsRunnable(ctrl.Log.WithName("ext-proc"))); err != nil {
114-
setupLog.Error(err, "Failed to register ext-proc gRPC server")
115113
return err
116114
}
117115

118116
// Start the manager. This blocks until a signal is received.
119117
setupLog.Info("Manager starting")
120118
if err := mgr.Start(ctx); err != nil {
121-
setupLog.Error(err, "Error starting manager")
122119
return err
123120
}
124121
setupLog.Info("Manager terminated")

cmd/epp/runner/runner.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ func (r *Runner) Run(ctx context.Context) error {
145145

146146
// Validate flags
147147
if err := validateFlags(); err != nil {
148-
setupLog.Error(err, "Failed to validate flags")
149148
return err
150149
}
151150

@@ -162,7 +161,6 @@ func (r *Runner) Run(ctx context.Context) error {
162161
// --- Get Kubernetes Config ---
163162
cfg, err := ctrl.GetConfig()
164163
if err != nil {
165-
setupLog.Error(err, "Failed to get Kubernetes rest config")
166164
return err
167165
}
168166

@@ -206,7 +204,6 @@ func (r *Runner) Run(ctx context.Context) error {
206204

207205
mgr, err := runserver.NewDefaultManager(poolGKNN, cfg, metricsServerOptions, *haEnableLeaderElection)
208206
if err != nil {
209-
setupLog.Error(err, "Failed to create controller manager")
210207
return err
211208
}
212209

@@ -226,7 +223,6 @@ func (r *Runner) Run(ctx context.Context) error {
226223
setupLog.Info("Enabling pprof handlers")
227224
err = setupPprofHandlers(mgr)
228225
if err != nil {
229-
setupLog.Error(err, "Failed to setup pprof handlers")
230226
return err
231227
}
232228
runtime.SetMutexProfileFraction(1)
@@ -235,14 +231,12 @@ func (r *Runner) Run(ctx context.Context) error {
235231

236232
err = r.parsePluginsConfiguration(ctx)
237233
if err != nil {
238-
setupLog.Error(err, "Failed to parse plugins configuration")
239234
return err
240235
}
241236

242237
// --- Initialize Core EPP Components ---
243238
if r.schedulerConfig == nil {
244239
err := errors.New("scheduler config must be set either by config api or through code")
245-
setupLog.Error(err, "failed to create scheduler")
246240
return err
247241
}
248242

@@ -270,7 +264,6 @@ func (r *Runner) Run(ctx context.Context) error {
270264
UseExperimentalDatalayerV2: useDatalayerV2, // pluggable data layer feature flag
271265
}
272266
if err := serverRunner.SetupWithManager(ctx, mgr); err != nil {
273-
setupLog.Error(err, "Failed to setup EPP controllers")
274267
return err
275268
}
276269

@@ -289,7 +282,6 @@ func (r *Runner) Run(ctx context.Context) error {
289282
// This blocks until a signal is received.
290283
setupLog.Info("Controller manager starting")
291284
if err := mgr.Start(ctx); err != nil {
292-
setupLog.Error(err, "Error starting controller manager")
293285
return err
294286
}
295287
setupLog.Info("Controller manager terminated")
@@ -362,7 +354,6 @@ func setupMetricsV1(setupLog logr.Logger) (datalayer.EndpointFactory, error) {
362354
*loraInfoMetric,
363355
)
364356
if err != nil {
365-
setupLog.Error(err, "Failed to create metric mapping from flags.")
366357
return nil, err
367358
}
368359
verifyMetricMapping(*mapping, setupLog)
@@ -440,7 +431,6 @@ func initLogging(opts *zap.Options) {
440431
// registerExtProcServer adds the ExtProcServerRunner as a Runnable to the manager.
441432
func registerExtProcServer(mgr manager.Manager, runner *runserver.ExtProcServerRunner, logger logr.Logger) error {
442433
if err := mgr.Add(runner.AsRunnable(logger)); err != nil {
443-
setupLog.Error(err, "Failed to register ext-proc gRPC server runnable")
444434
return err
445435
}
446436
setupLog.Info("ExtProc server runner added to manager.")
@@ -458,7 +448,6 @@ func registerHealthServer(mgr manager.Manager, logger logr.Logger, ds datastore.
458448
})
459449
if err := mgr.Add(
460450
runnable.NoLeaderElection(runnable.GRPCServer("health", srv, port))); err != nil {
461-
setupLog.Error(err, "Failed to register health server")
462451
return err
463452
}
464453
return nil

internal/runnable/grpc.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ 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")
4140
return err
4241
}
4342

@@ -59,7 +58,6 @@ 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")
6361
return err
6462
}
6563
log.Info("gRPC server terminated")

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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable {
5454
if r.SecureServing {
5555
cert, err := tlsutil.CreateSelfSignedTLSCertificate(logger)
5656
if err != nil {
57-
logger.Error(err, "Failed to create self signed certificate")
5857
return err
5958
}
6059
creds := credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}})

pkg/epp/controller/inferenceobjective_reconciler.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ func (c *InferenceObjectiveReconciler) Reconcile(ctx context.Context, req ctrl.R
4848
notFound := false
4949
if err := c.Get(ctx, req.NamespacedName, infObjective); err != nil {
5050
if !errors.IsNotFound(err) {
51-
logger.Error(err, "Unable to get InferenceObjective")
5251
return ctrl.Result{}, err
5352
}
5453
notFound = true

pkg/epp/controller/inferencepool_reconciler.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
5757
default:
5858
// Handle unsupported groups gracefully.
5959
err := fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group)
60-
logger.Error(err, "Cannot reconcile InferencePool")
6160
return ctrl.Result{}, err
6261
}
6362

@@ -68,7 +67,6 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
6867
c.Datastore.Clear()
6968
return ctrl.Result{}, nil
7069
}
71-
logger.Error(err, "Unable to get InferencePool")
7270
return ctrl.Result{}, err
7371
}
7472

@@ -90,15 +88,13 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
9088
var err error
9189
err = pool.ConvertTo(v1infPool)
9290
if err != nil {
93-
logger.Error(err, "Failed to convert XInferencePool to InferencePool")
9491
return ctrl.Result{}, err
9592
}
9693
default:
9794
return ctrl.Result{}, fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group)
9895
}
9996

10097
if err := c.Datastore.PoolSet(ctx, c.Reader, v1infPool); err != nil {
101-
logger.Error(err, "Failed to update datastore")
10298
return ctrl.Result{}, err
10399
}
104100

pkg/epp/controller/pod_reconciler.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
5555
c.Datastore.PodDelete(req.NamespacedName)
5656
return ctrl.Result{}, nil
5757
}
58-
logger.V(logutil.DEFAULT).Error(err, "Unable to get pod")
5958
return ctrl.Result{}, err
6059
}
6160

pkg/epp/handlers/response.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ func (s *StreamingServer) HandleResponseBody(ctx context.Context, reqCtx *Reques
3939
logger := log.FromContext(ctx)
4040
responseBytes, err := json.Marshal(response)
4141
if err != nil {
42-
logger.V(logutil.DEFAULT).Error(err, "error marshalling responseBody")
4342
return reqCtx, err
4443
}
4544
if response["usage"] != nil {

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

0 commit comments

Comments
 (0)