Skip to content

Commit 2ad6312

Browse files
authored
Fix kafka source logging when failing to commit offsets (MaterializeInc#33505)
Fix the order of config.id and worker_id ### Motivation reducing global entropy ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
1 parent 3587420 commit 2ad6312

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/storage/src/source/kafka.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,10 @@ fn render_reader<G: Scope<Timestamp = KafkaTimestamp>>(
509509
offset_commit_metrics.offset_commit_failures.inc();
510510
tracing::warn!(
511511
%e,
512-
"timely-{} source({}) failed to commit offsets: resume_upper={}",
513-
config.id,
514-
config.worker_id,
515-
resume_upper.pretty()
512+
"timely-{worker_id} source({source_id}) failed to commit offsets: resume_upper={upper}",
513+
worker_id = config.worker_id,
514+
source_id = config.id,
515+
upper = resume_upper.pretty()
516516
);
517517
}
518518
}
@@ -524,10 +524,10 @@ fn render_reader<G: Scope<Timestamp = KafkaTimestamp>>(
524524
offset_commit_metrics.offset_commit_failures.inc();
525525
tracing::warn!(
526526
%e,
527-
"timely-{} source({}) failed to commit offsets: resume_upper={}",
528-
config.id,
529-
config.worker_id,
530-
frontier.pretty()
527+
"timely-{worker_id} source({source_id}) failed to commit offsets: resume_upper={upper}",
528+
worker_id = config.worker_id,
529+
source_id = config.id,
530+
upper = frontier.pretty()
531531
);
532532
}
533533
}

0 commit comments

Comments
 (0)