You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ch...@apache.org on 2025/03/22 11:44:15 UTC
(kafka) branch trunk updated: KAFKA-18980 OffsetMetadataManager#cleanupExpiredOffsets should record the number of records rather than topic partitions (#19207)
This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5d2bfb41517 KAFKA-18980 OffsetMetadataManager#cleanupExpiredOffsets should record the number of records rather than topic partitions (#19207)
5d2bfb41517 is described below
commit 5d2bfb4151700000fc5ec22918ecd3cecb5178a5
Author: Nick Guo <la...@gmail.com>
AuthorDate: Sat Mar 22 19:44:09 2025 +0800
KAFKA-18980 OffsetMetadataManager#cleanupExpiredOffsets should record the number of records rather than topic partitions (#19207)
jira: https://issues.apache.org/jira/browse/KAFKA-18980
We should use the number of `records` rather than topic partitions,but
this is not a bug as the number of `records` should be equal to the
number of topic partitions.
Also, we previously used `expiredPartitions` for logging, but now it is
not being used anymore, so we can remove it.
Reviewers: TengYao Chi <ki...@gmail.com>, Chia-Ping Tsai
<ch...@gmail.com>
---
.../kafka/coordinator/group/OffsetMetadataManager.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
index cd0eaa8bf61..9f601a74917 100644
--- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
+++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
@@ -56,12 +56,10 @@ import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalLong;
-import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
@@ -858,7 +856,6 @@ public class OffsetMetadataManager {
// We expect the group to exist.
Group group = groupMetadataManager.group(groupId);
- Set<String> expiredPartitions = new HashSet<>();
long currentTimestampMs = time.milliseconds();
Optional<OffsetExpirationCondition> offsetExpirationCondition = group.offsetExpirationCondition();
@@ -875,7 +872,7 @@ public class OffsetMetadataManager {
// We don't expire the offset yet if there is a pending transactional offset for the partition.
if (condition.isOffsetExpired(offsetAndMetadata, currentTimestampMs, config.offsetsRetentionMs()) &&
!hasPendingTransactionalOffsets(groupId, topic, partition)) {
- expiredPartitions.add(appendOffsetCommitTombstone(groupId, topic, partition, records).toString());
+ appendOffsetCommitTombstone(groupId, topic, partition, records);
log.debug("[GroupId {}] Expired offset for partition={}-{}", groupId, topic, partition);
} else {
allOffsetsExpired.set(false);
@@ -885,7 +882,7 @@ public class OffsetMetadataManager {
allOffsetsExpired.set(false);
}
});
- metrics.record(OFFSET_EXPIRED_SENSOR_NAME, expiredPartitions.size());
+ metrics.record(OFFSET_EXPIRED_SENSOR_NAME, records.size());
// We don't want to remove the group if there are ongoing transactions.
return allOffsetsExpired.get() && !openTransactionsByGroup.containsKey(groupId);
@@ -937,19 +934,15 @@ public class OffsetMetadataManager {
* @param topic The topic name.
* @param partition The partition.
* @param records The list of records to append the tombstone.
- *
- * @return The topic partition of the corresponding tombstone.
*/
- private TopicPartition appendOffsetCommitTombstone(
+ private void appendOffsetCommitTombstone(
String groupId,
String topic,
int partition,
List<CoordinatorRecord> records
) {
records.add(GroupCoordinatorRecordHelpers.newOffsetCommitTombstoneRecord(groupId, topic, partition));
- TopicPartition tp = new TopicPartition(topic, partition);
- log.trace("[GroupId {}] Removing expired offset and metadata for {}", groupId, tp);
- return tp;
+ log.trace("[GroupId {}] Removing expired offset and metadata for {}-{}", groupId, topic, partition);
}
/**