Skip to content
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

[controller ]Avoid client side store deletion timeout due to admin message is not consumed. #1511

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[controller ]Avoid client side store deletion timeout due to admin message is not consumed. #1511

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
12 changes: 9 additions & 3 deletions ...enice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
import com.linkedin.venice.exceptions.VeniceException;
import com.linkedin.venice.exceptions.VeniceHttpException;
import com.linkedin.venice.exceptions.VeniceNoStoreException;
import com.linkedin.venice.exceptions.VeniceTimeoutException;
import com.linkedin.venice.exceptions.VeniceUnsupportedOperationException;
import com.linkedin.venice.helix.HelixReadOnlyStoreConfigRepository;
import com.linkedin.venice.helix.HelixReadOnlyZKSharedSchemaRepository;
Expand Down Expand Up @@ -729,7 +730,7 @@ private void waitingMessageToBeConsumed(String clusterName, String storeName, lo
"Timed out after waiting for " + waitingTimeForConsumptionMs + "ms for admin consumption to catch up.";
errMsg += " Consumed execution id: " + consumedExecutionId + ", waiting to be consumed id: " + executionId;
errMsg += (lastException == null) ? "" : " Last exception: " + lastException.getMessage();
throw new VeniceException(errMsg, lastException);
throw new VeniceTimeoutException(errMsg, lastException);
}

LOGGER.info("Waiting execution id: {} to be consumed, currently at: {}", executionId, consumedExecutionId);
Expand Down Expand Up @@ -978,8 +979,13 @@ public void deleteStore(
AdminOperation message = new AdminOperation();
message.operationType = AdminMessageType.DELETE_STORE.getValue();
message.payloadUnion = deleteStore;

sendAdminMessageAndWaitForConsumed(clusterName, storeName, message);
// When multiple store deletions happened in a short time range, it is possible that the store deletion message
// will not be consumed in time, as previous store deletion message is still being processed.
try {
sendAdminMessageAndWaitForConsumed(clusterName, storeName, message);
} catch (VeniceTimeoutException e) {
LOGGER.warn("Encountering timeout during deleting store: {} from cluster: {}", storeName, clusterName, e);
}

// Deleting ACL needs to be the last step in store deletion process.
if (store != null) {
Expand Down
Loading