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

mapcache_seed: try to kill still running threads after grace period #313

Merged
merged 4 commits into from
Sep 27, 2023
Merged

mapcache_seed: try to kill still running threads after grace period #313

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7600b55
Handle stuck threads more gracefully
Jul 26, 2022
2b155c5
Add an explanation of delay before retry + fix formating
marisn Jun 13, 2023
7b7ccc7
mapcache_seed: a better version of forcefully terminating threads if …
marisn Jun 14, 2023
1078775
Print a warning if seeder threads need to be stoped forcefully
marisn Sep 27, 2023
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
36 changes: 34 additions & 2 deletions util/mapcache_seed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,23 @@ void cmd_recurse(mapcache_context *cmd_ctx, mapcache_tile *tile)
if(sig_int_received || error_detected) { //stop if we were asked to stop by hitting ctrl-c
//remove all items from the queue
struct seed_cmd entry;
while (trypop_queue(&entry)!=APR_EAGAIN) /*do nothing*/;
int retry_count = 0;
int ret = trypop_queue(&entry);
while (ret != APR_EAGAIN) {
// try to empty queue with a graceful retreat up to 55 seconds
// for retries before forcefully terminating threads
if (ret == APR_EOF)
break;
if (ret != APR_SUCCESS)
retry_count++;
if (retry_count > 10) {
printf("Feed worker threads failed to terminate. Stopping forcefully.\n");
apr_queue_interrupt_all(work_queue);
break;
}
apr_sleep(retry_count * 1000000);
ret = trypop_queue(&entry);
}
return;
}

Expand Down Expand Up @@ -614,7 +630,23 @@ void feed_worker()
if(sig_int_received || error_detected) { //stop if we were asked to stop by hitting ctrl-c
//remove all items from the queue
struct seed_cmd entry;
while (trypop_queue(&entry)!=APR_EAGAIN) /* do nothing */;
int retry_count = 0;
int ret = trypop_queue(&entry);
while (ret != APR_EAGAIN) {
// try to empty queue with a graceful retreat up to 55 seconds
// for retries before forcefully terminating threads
if (ret == APR_EOF)
break;
if (ret != APR_SUCCESS)
retry_count++;
if (retry_count > 10) {
printf("Feed worker threads failed to terminate. Stopping forcefully.\n");
apr_queue_interrupt_all(work_queue);
break;
}
apr_sleep(retry_count * 1000000);
ret = trypop_queue(&entry);
}
break;
}
if(iteration_mode == MAPCACHE_ITERATION_LOG) {
Expand Down
Loading