Skip to content

Remove numerical offset usage #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove numerical offset usage #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions ...controller/src/main/java/com/linkedin/venice/controller/kafka/consumer/AdminMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,33 +178,17 @@ private PubSubPosition getPubSubPosition(PubSubPosition position, Long offset) {
} else {
return PubSubSymbolicPosition.EARLIEST;
}
} else if (offset != null && offset > position.getNumericOffset()) {
LOGGER.warn(
"Offset {} is greater than position {}. Resetting position to offset.",
offset,
position.getNumericOffset());
return ApacheKafkaOffsetPosition.of(offset);
} else {
return position;
}
}

public void setPubSubPosition(PubSubPosition pubSubPosition) {
this.position = pubSubPosition;
if (pubSubPosition != null) {
this.offset = pubSubPosition.getNumericOffset();
} else {
this.offset = UNDEFINED_VALUE;
}
}

public void setUpstreamPubSubPosition(PubSubPosition upstreamPubPosition) {
this.upstreamPosition = upstreamPubPosition;
if (upstreamPubPosition != null) {
this.upstreamOffset = upstreamPubPosition.getNumericOffset();
} else {
this.upstreamOffset = UNDEFINED_VALUE;
}
}

@Override
Expand Down
6 changes: 0 additions & 6 deletions ...-controller/src/main/java/com/linkedin/venice/controller/stats/AdminConsumptionStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ public AdminConsumptionStats(MetricsRepository metricsRepository, String name) {
adminConsumeFailCountSensor = registerSensor("failed_admin_messages", new Count());
adminConsumeFailRetriableMessageCountSensor = registerSensor("failed_retriable_admin_messages", new Count());
adminTopicDIVErrorReportCountSensor = registerSensor("admin_message_div_error_report_count", new Count());
registerSensor(
new AsyncGauge(
(ignored, ignored2) -> adminConsumptionFailedPosition == null
? 0L
: adminConsumptionFailedPosition.getNumericOffset(),
"failed_admin_message_offset"));
adminConsumptionCycleDurationMsSensor =
registerSensor("admin_consumption_cycle_duration_ms", new Avg(), new Min(), new Max());
registerSensor(
Expand Down
1 change: 1 addition & 0 deletions ...roller/src/test/java/com/linkedin/venice/controller/kafka/consumer/TestAdminMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void testSerializeAndDeserializeAdminMetadata() throws IOException {

// Verify JSON is human-readable
String jsonString = new String(jsonBytes);
System.out.println("Serialized AdminMetadata JSON: " + jsonString);
assertTrue(jsonString.contains("\"executionId\" : 123"));
assertTrue(jsonString.contains("\"offset\" : 12345"));
assertTrue(jsonString.contains("\"upstreamOffset\" : 67890"));
Expand Down
Loading