Skip to content

Fix possible NPE in WorkerBulkByScrollTaskState.java #17840

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
andrross merged 1 commit into from
Apr 8, 2025
Merged

Fix possible NPE in WorkerBulkByScrollTaskState.java #17840

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
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/index/reindex/WorkerBulkByScrollTaskState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,14 @@ DelayedPrepareBulkRequest rethrottle(float newRequestsPerSecond) {
return this;
}

long remainingDelay = scheduled.getDelay(TimeUnit.NANOSECONDS);
// Actually reschedule the task
if (scheduled == null || false == scheduled.cancel()) {
// Couldn't cancel, probably because the task has finished or been scheduled. Either way we have nothing to do here.
logger.debug("[{}]: skipping rescheduling because we couldn't cancel the task", task.getId());
return this;
}

long remainingDelay = scheduled.getDelay(TimeUnit.NANOSECONDS);
/* Strangely enough getting here doesn't mean that you actually
* cancelled the request, just that you probably did. If you stress
* test it you'll find that requests sneak through. So each request
Expand Down
Loading