Skip to content

Fix DynamoJobConfigClient to to write resource key items in batches (>25 items) #1888

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
roegi merged 2 commits into from
Jul 8, 2026
Merged

Fix DynamoJobConfigClient to to write resource key items in batches (>25 items) #1888

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
128d885
Fix DynamoJobConfigClient to to write resource key items in batches (…
roegi Jul 8, 2026
f8f5540
Same (batch) fix for deletions
roegi Jul 8, 2026
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
45 changes: 40 additions & 5 deletions xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/config/DynamoJobConfigClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ public Future<Void> storeJob(Job job) {
});
}

private static final int DYNAMODB_BATCH_WRITE_LIMIT = 25;

private void batchWriteResourceKeys(String jobId, Set<String> resourceKeys, long keepUntil) {
if (resourceKeys.size() > MAX_RESOURCE_KEYS)
throw new RuntimeException("Resource keys exceeds maximum allowed size of " + MAX_RESOURCE_KEYS);
Expand All @@ -358,14 +360,47 @@ private void batchWriteResourceKeys(String jobId, Set<String> resourceKeys, long
))))
.toList();

executeBatchWriteRequest(Map.of(resourceKeyTable.getTableName(), writeRequests));
for (int i = 0; i < writeRequests.size(); i += DYNAMODB_BATCH_WRITE_LIMIT) {
List<WriteRequest> batch = writeRequests.subList(
i,
Math.min(i + DYNAMODB_BATCH_WRITE_LIMIT, writeRequests.size())
);

executeBatchWriteRequest(
Map.of(resourceKeyTable.getTableName(), batch)
);
}
}

private void executeBatchWriteRequest(Map<String, List<WriteRequest>> requestItems) {
BatchWriteItemResult result = dynamoClient.client.batchWriteItem(new BatchWriteItemRequest().withRequestItems(requestItems));
private static final int MAX_RETRIES = 10;
private static final long RETRY_DELAY_MS = 100;

if (!result.getUnprocessedItems().isEmpty())
executeBatchWriteRequest(result.getUnprocessedItems());
private void executeBatchWriteRequest(Map<String, List<WriteRequest>> requestItems) {
Map<String, List<WriteRequest>> unprocessed = requestItems;
int retries = 0;

while (!unprocessed.isEmpty()) {
BatchWriteItemResult result = dynamoClient.client.batchWriteItem(
new BatchWriteItemRequest().withRequestItems(unprocessed)
);

unprocessed = result.getUnprocessedItems();

if (!unprocessed.isEmpty()) {
if (++retries > MAX_RETRIES) {
throw new RuntimeException(
"Failed to process all DynamoDB batch write requests after "
+ MAX_RETRIES + " retries."
);
}

try {
Thread.sleep(RETRY_DELAY_MS);
} catch (InterruptedException e) {
//ignore
}
}
}
}

@Override
Expand Down
Loading