Skip to content

MINOR FIX: refactor naming of client metadata in StreamsPartitionAssignor #6316

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
mjsax merged 1 commit into from
Feb 27, 2019
Merged

MINOR FIX: refactor naming of client metadata in StreamsPartitionAssignor #6316

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
18 changes: 9 additions & 9 deletions .../src/main/java/org/apache/kafka/streams/processor/internals/StreamsPartitionAssignor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ private Map<String, Assignment> errorAssignment(final Map<UUID, ClientMetadata>
public Map<String, Assignment> assign(final Cluster metadata,
final Map<String, Subscription> subscriptions) {
// construct the client metadata from the decoded subscription info
final Map<UUID, ClientMetadata> clientsMetadata = new HashMap<>();
final Map<UUID, ClientMetadata> clientMetadataMap = new HashMap<>();
final Set<String> futureConsumers = new HashSet<>();

int minReceivedMetadataVersion = SubscriptionInfo.LATEST_SUPPORTED_VERSION;
Expand All @@ -417,11 +417,11 @@ public Map<String, Assignment> assign(final Cluster metadata,
}

// create the new client metadata if necessary
ClientMetadata clientMetadata = clientsMetadata.get(info.processId());
ClientMetadata clientMetadata = clientMetadataMap.get(info.processId());

if (clientMetadata == null) {
clientMetadata = new ClientMetadata(info.userEndPoint());
clientsMetadata.put(info.processId(), clientMetadata);
clientMetadataMap.put(info.processId(), clientMetadata);
}

// add the consumer to the client
Expand Down Expand Up @@ -449,7 +449,7 @@ public Map<String, Assignment> assign(final Cluster metadata,
SubscriptionInfo.LATEST_SUPPORTED_VERSION);
}

log.debug("Constructed client metadata {} from the member subscriptions.", clientsMetadata);
log.debug("Constructed client metadata {} from the member subscriptions.", clientMetadataMap);

// ---------------- Step Zero ---------------- //

Expand All @@ -465,7 +465,7 @@ public Map<String, Assignment> assign(final Cluster metadata,
!metadata.topics().contains(topic)) {
log.error("Missing source topic {} durign assignment. Returning error {}.",
topic, Error.INCOMPLETE_SOURCE_TOPIC_METADATA.name());
return errorAssignment(clientsMetadata, topic, Error.INCOMPLETE_SOURCE_TOPIC_METADATA.code);
return errorAssignment(clientMetadataMap, topic, Error.INCOMPLETE_SOURCE_TOPIC_METADATA.code);
}
}
for (final InternalTopicConfig topic: topicsInfo.repartitionSourceTopics.values()) {
Expand Down Expand Up @@ -623,7 +623,7 @@ public Map<String, Assignment> assign(final Cluster metadata,

// assign tasks to clients
final Map<UUID, ClientState> states = new HashMap<>();
for (final Map.Entry<UUID, ClientMetadata> entry : clientsMetadata.entrySet()) {
for (final Map.Entry<UUID, ClientMetadata> entry : clientMetadataMap.entrySet()) {
states.put(entry.getKey(), entry.getValue().state);
}

Expand All @@ -640,7 +640,7 @@ public Map<String, Assignment> assign(final Cluster metadata,
// construct the global partition assignment per host map
final Map<HostInfo, Set<TopicPartition>> partitionsByHostState = new HashMap<>();
if (minReceivedMetadataVersion >= 2) {
for (final Map.Entry<UUID, ClientMetadata> entry : clientsMetadata.entrySet()) {
for (final Map.Entry<UUID, ClientMetadata> entry : clientMetadataMap.entrySet()) {
final HostInfo hostInfo = entry.getValue().hostInfo;

if (hostInfo != null) {
Expand All @@ -659,9 +659,9 @@ public Map<String, Assignment> assign(final Cluster metadata,

final Map<String, Assignment> assignment;
if (versionProbing) {
assignment = versionProbingAssignment(clientsMetadata, partitionsForTask, partitionsByHostState, futureConsumers, minReceivedMetadataVersion);
assignment = versionProbingAssignment(clientMetadataMap, partitionsForTask, partitionsByHostState, futureConsumers, minReceivedMetadataVersion);
} else {
assignment = computeNewAssignment(clientsMetadata, partitionsForTask, partitionsByHostState, minReceivedMetadataVersion);
assignment = computeNewAssignment(clientMetadataMap, partitionsForTask, partitionsByHostState, minReceivedMetadataVersion);
}

return assignment;
Expand Down