KAFKA-5822: Consistent log formatting of topic partitions #3778
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
retest this please |
ijuma
reviewed
Sep 14, 2017
| @@ -69,7 +69,7 @@ class Partition(val topic: String, | |||
| * In addition to the leader, the controller can also send the epoch of the controller that elected the leader for | |||
| * each partition. */ | |||
| private var controllerEpoch: Int = KafkaController.InitialControllerEpoch - 1 | |||
| this.logIdent = "Partition [%s,%d] on broker %d: ".format(topic, partitionId, localBrokerId) | |||
| this.logIdent = s"Partition $topicPartition on broker $localBrokerId: " | |||
There was a problem hiding this comment.
Shall we use the convention we've been using for LogContext? That is [Foo key=value] .
| @@ -37,5 +37,5 @@ case class TopicAndPartition(topic: String, partition: Int) { | |||
|
|
|||
| def asTopicPartition = new TopicPartition(topic, partition) | |||
|
|
|||
| override def toString = "[%s,%d]".format(topic, partition) | |||
| override def toString(): String = s"$topic-$partition" | |||
| .format(controllerId, controller.epoch, replicaId, topic, partition, currState, targetState), t) | ||
| stateChangeLogger.error(("Controller %d epoch %d initiated state change of replica %d for partition " + | ||
| "%s from %s to %s failed") | ||
| .format(controllerId, controller.epoch, replicaId, topicAndPartition, currState, targetState), t) |
There was a problem hiding this comment.
Maybe you want to change this to use string interpolation as well?
| updatePartitionsWithError(topicPartition) | ||
| case e: KafkaStorageException => | ||
| logger.error(s"Error while processing data for partition $topicPartition", e) | ||
| updatePartitionsWithError(topicPartition) | ||
| case e: Throwable => | ||
| throw new KafkaException("error processing data for partition [%s,%d] offset %d" | ||
| .format(topic, partitionId, currentPartitionFetchState.fetchOffset), e) | ||
| throw new KafkaException(s"error processing data for partition $topicPartition " + |
| } catch { | ||
| case e: FatalExitError => throw e | ||
| case e: Throwable => | ||
| error("Error getting offset for partition [%s,%d] to broker %d".format(topic, partitionId, sourceBroker.id), e) | ||
| error(s"Error getting offset for partition $topicPartition to broker ${sourceBroker.id}") |
There was a problem hiding this comment.
Is it intentional to drop the e from the log?
| val dirOpt = getLogDir(new TopicPartition(partition.topic, partition.partitionId)) | ||
| "controller %d epoch %d for partition %s since the replica for the partition is offline due to disk error %s") | ||
| .format(localBrokerId, correlationId, controllerId, partitionStateInfo.basePartitionState.controllerEpoch, | ||
| partition.topicPartition, e)) |
There was a problem hiding this comment.
String interpolation here too?
There was a problem hiding this comment.
ugh. you knew that mentioning this would force me to change all the others too
hachikuji
force-pushed
the
KAFKA-5822
branch
from
a40373c
to
8ef7730
Compare
hachikuji
force-pushed
the
KAFKA-5822
branch
from
8ef7730
to
a4fa5c3
Compare
ijuma
approved these changes
Sep 15, 2017
| "%d epoch %d with correlation id %d for partition %s") | ||
| .format(localBrokerId, controllerId, epoch, correlationId, partition.topicPartition)) | ||
| stateChangeLogger.trace("Stopped fetchers as part of become-leader request from controller " + | ||
| s"$controllerId epoch $epoch with correlation id $correlationId for partition ${partition.topicPartition}" + |
There was a problem hiding this comment.
Space missing here before (last. Will fix before merging.
| stateChangeLogger.error(s"Skipped the become-leader state change with correlation id $correlationId from " + | ||
| s"controller $controllerId epoch $epoch for partition ${partition.topicPartition} " + | ||
| s"(last update controller epoch ${partitionStateInfo.basePartitionState.controllerEpoch}) since " + | ||
| s"the replica for the partition is offline due to disk error in $e") |
There was a problem hiding this comment.
in before e probably unintentional.
| stateChangeLogger.info("Skipped the become-follower state change after marking its partition as " + | ||
| s"follower with correlation id $correlationId from controller $controllerId epoch $epoch " + | ||
| s"for partition ${partition.topicPartition} (last update " + | ||
| s"controller epoch ${partitionStateInfo.basePartitionState.controllerEpoch}), " + |
There was a problem hiding this comment.
Removing the comma since it doesn't seem to flow right given that the next word is since.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.