Skip to content

MINOR: Fix log message error of loadTransactionMetadata #6571

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

Merged
hachikuji merged 1 commit into from
Apr 25, 2019
Merged

MINOR: Fix log message error of loadTransactionMetadata #6571

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
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ class GroupMetadataManager(brokerId: Int,
// buffer may not be needed if records are read from memory
var buffer = ByteBuffer.allocate(0)

// loop breaks if leader changes at any time during the load, since getHighWatermark is -1
// loop breaks if leader changes at any time during the load, since logEndOffset is -1
val loadedOffsets = mutable.Map[GroupTopicPartition, CommitRecordMetadataAndOffset]()
val pendingOffsets = mutable.Map[Long, mutable.Map[GroupTopicPartition, CommitRecordMetadataAndOffset]]()
val loadedGroups = mutable.Map[String, GroupMetadata]()
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,13 @@ class TransactionStateManager(brokerId: Int,

replicaManager.getLog(topicPartition) match {
case None =>
warn(s"Attempted to load offsets and group metadata from $topicPartition, but found no log")
warn(s"Attempted to load transaction metadata from $topicPartition, but found no log")

case Some(log) =>
// buffer may not be needed if records are read from memory
var buffer = ByteBuffer.allocate(0)

// loop breaks if leader changes at any time during the load, since getHighWatermark is -1
// loop breaks if leader changes at any time during the load, since logEndOffset is -1
var currOffset = log.logStartOffset

try {
Expand All @@ -312,7 +312,7 @@ class TransactionStateManager(brokerId: Int,
// minOneMessage = true in the above log.read means that the buffer may need to be grown to ensure progress can be made
if (buffer.capacity < bytesNeeded) {
if (config.transactionLogLoadBufferSize < bytesNeeded)
warn(s"Loaded offsets and group metadata from $topicPartition with buffer larger ($bytesNeeded bytes) than " +
warn(s"Loaded transaction metadata from $topicPartition with buffer larger ($bytesNeeded bytes) than " +
s"configured transaction.state.log.load.buffer.size (${config.transactionLogLoadBufferSize} bytes)")

buffer = ByteBuffer.allocate(bytesNeeded)
Expand Down