Skip to content

[server][dvc] Preserve PCS during non-Helix UNSUBSCRIBE to maintain quota accuracy #2299

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

[server][dvc] Preserve PCS during non-Helix UNSUBSCRIBE to maintain quota accuracy #2299

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
9 changes: 5 additions & 4 deletions ...da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,11 +2368,12 @@ protected void processCommonConsumerAction(ConsumerAction consumerAction) throws
* {@link #kafkaDataValidationService}, we would like to drain all the buffered messages before cleaning up those
* two variables to avoid the race condition.
*/
partitionConsumptionStateMap.remove(partition);
if (consumerAction.isHelixTriggeredAction()) {
if (isDaVinciClient() || consumerAction.isHelixTriggeredAction()) {
LOGGER.info(
"Removing tracking of replica: {} from storage utilization manager as this UNSUBSCRIBE is helix triggered action",
topicPartition);
"Removing replica: {} from PCS map and storage utilization manager. Trigger: {}",
topicPartition,
isDaVinciClient() ? "DaVinci client unsubscribe" : "Helix-triggered unsubscribe");
Comment on lines 2372 to +2375
Copy link

Copilot AI Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The log message has a logical inconsistency. When isDaVinciClient() returns true, the ternary operator will always select "DaVinci client unsubscribe", even if the action is also Helix-triggered. This could be misleading in cases where a DaVinci client uses Helix-triggered unsubscribe.

Consider restructuring the log message to accurately reflect both conditions:

String trigger = isDaVinciClient() 
    ? (consumerAction.isHelixTriggeredAction() ? "DaVinci client (Helix-triggered)" : "DaVinci client") 
    : "Helix-triggered unsubscribe";
LOGGER.info(
    "Removing replica: {} from PCS map and storage utilization manager. Trigger: {}",
    topicPartition,
    trigger);

Copilot uses AI. Check for mistakes.
partitionConsumptionStateMap.remove(partition);
storageUtilizationManager.removePartition(partition);
}
getDataIntegrityValidator().clearPartition(partition);
Expand Down
Loading