From 78ee6e0959292d5a509a87a94bcb0c4eb843d974 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 6 Aug 2024 15:04:52 +0300 Subject: [PATCH 1/4] agent: skip err= log for batch update metadata complete --- agent/agent.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/agent.go b/agent/agent.go index 5512f04db28ea..15c2c420dbffa 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -588,10 +588,11 @@ func (a *agent) reportMetadata(ctx context.Context, conn drpc.Conn) error { updatedMetadata[mr.key] = mr.result continue case err := <-reportError: - a.logger.Debug(ctx, "batch update metadata complete", slog.Error(err)) if err != nil { + a.logger.Debug(ctx, "batch update metadata complete", slog.Error(err)) return xerrors.Errorf("failed to report metadata: %w", err) } + a.logger.Debug(ctx, "batch update metadata complete") reportInFlight = false case <-report: if len(updatedMetadata) == 0 { From 40c77ea679533dd13220a9578206d5b4d2179878 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 6 Aug 2024 22:59:29 +0300 Subject: [PATCH 2/4] Update agent/agent.go Co-authored-by: Steven Masley --- agent/agent.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 15c2c420dbffa..03359341d7577 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -588,11 +588,12 @@ func (a *agent) reportMetadata(ctx context.Context, conn drpc.Conn) error { updatedMetadata[mr.key] = mr.result continue case err := <-reportError: + logMsg := ""batch update metadata complete"" if err != nil { - a.logger.Debug(ctx, "batch update metadata complete", slog.Error(err)) + a.logger.Debug(ctx, logMsg, slog.Error(err)) return xerrors.Errorf("failed to report metadata: %w", err) } - a.logger.Debug(ctx, "batch update metadata complete") + a.logger.Debug(ctx, logMsg) reportInFlight = false case <-report: if len(updatedMetadata) == 0 { From 1038ec5055bade006449e67806a2ed5ecfdb58b8 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 6 Aug 2024 23:01:35 +0300 Subject: [PATCH 3/4] Update agent/agent.go --- agent/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent.go b/agent/agent.go index 03359341d7577..7df814e7e651a 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -588,7 +588,7 @@ func (a *agent) reportMetadata(ctx context.Context, conn drpc.Conn) error { updatedMetadata[mr.key] = mr.result continue case err := <-reportError: - logMsg := ""batch update metadata complete"" + logMsg := ""batch update metadata complete"" if err != nil { a.logger.Debug(ctx, logMsg, slog.Error(err)) return xerrors.Errorf("failed to report metadata: %w", err) From d494051b8916d5c98804820f80bca41fcc77e7fc Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 6 Aug 2024 23:01:55 +0300 Subject: [PATCH 4/4] Update agent/agent.go --- agent/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent.go b/agent/agent.go index 7df814e7e651a..30db6f073cc69 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -588,7 +588,7 @@ func (a *agent) reportMetadata(ctx context.Context, conn drpc.Conn) error { updatedMetadata[mr.key] = mr.result continue case err := <-reportError: - logMsg := ""batch update metadata complete"" + logMsg := "batch update metadata complete" if err != nil { a.logger.Debug(ctx, logMsg, slog.Error(err)) return xerrors.Errorf("failed to report metadata: %w", err)