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

Jump to bottom

Issue #2195 - Have client-driven reindex exit if no work to do #2567

Merged
merged 2 commits into from
Jul 1, 2021
Merged

Issue #2195 - Have client-driven reindex exit if no work to do #2567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b92169
Issue #2195 - Have client-driven reindex exit if no work to do
tbieste Jul 1, 2021
8c334a9
Issue #2195 - Fix testReindexFromTimestampDayTimeFormat testcase
tbieste Jul 1, 2021
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
8 changes: 6 additions & 2 deletions fhir-bucket/src/main/java/com/ibm/fhir/bucket/reindex/ClientDrivenReindexOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ public void monitorLoop() {
if (currentThreadCount == 0) {
// Nothing currently running, so make one test call to verify things are working
doneRetrieving = doneRetrieving || !callRetrieveIndex();
if (!blockingQueue.isEmpty()) {
if (blockingQueue.isEmpty()) {
// Do not even start the worker threads if nothing to do
logger.info("Nothing to do, so do not even start the worker threads");
this.running = false;
} else {
// Should be OK now to fill the pool with workers
logger.info("Index IDs available for processing - filling worker pool");
this.active = true;
Expand All @@ -176,7 +180,7 @@ public void monitorLoop() {
if (doneRetrieving) {
if (blockingQueue.isEmpty()) {
// Tell all the running threads they can stop now
logger.info("Nothing left to do, tell all the worker threads to exit");
logger.info("Nothing left to do, so tell all the worker threads to exit");
this.running = false;
} else {
// Worker threads are still processing, so sleep for a bit before we check again
Expand Down
2 changes: 1 addition & 1 deletion fhir-server-test/src/test/java/com/ibm/fhir/server/test/operation/ReindexOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void testReindexFromTimestampDayTimeFormat() {
+ "-"
+ String.format("%02d", zdt.getMonthValue())
+ "-"
+ zdt.getDayOfMonth();
+ String.format("%02d", zdt.getDayOfMonth());

List<Parameter> parameters = new ArrayList<>();
parameters.add(Parameter.builder()
Expand Down