Skip to content

Fix #766: Remove recrawl startup API entry on stop #767

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

Open
pr0vieh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix #766: Remove recrawl startup API entry on stop #767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff11ac5
Fix #766: remove recrawl startup entries on stop
pr0vieh Feb 27, 2026
59a2180
Fix #766: delete only tracked recrawl startup API entry
pr0vieh Feb 27, 2026
67f800d
Fix #766: keep terminated recrawl thread for report
pr0vieh Feb 27, 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
46 changes: 28 additions & 18 deletions source/net/yacy/htroot/IndexReIndexMonitor_p.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class IndexReIndexMonitor_p {

/** This servlet name, used for identifying recorded API calls */
private static final String SERVLET_NAME = IndexReIndexMonitor_p.class.getSimpleName() + ".html";
private static final String RECRAWL_STARTUP_APICALL_PK_CONFIG = "recrawlindex.startup.apicall.pk";

public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {

Expand Down Expand Up @@ -173,6 +174,10 @@ public static serverObjects respond(final RequestHeader header, final serverObje
WorkTables.calculateAPIScheduler(recrawlCall, false);
try {
sb.tables.update(WorkTables.TABLE_API_NAME, recrawlCall);
final byte[] recrawlCallPk = recrawlCall.getPK();
if (recrawlCallPk != null) {
sb.setConfig(RECRAWL_STARTUP_APICALL_PK_CONFIG, UTF8.String(recrawlCallPk));
}
} catch (final IOException e) {
ConcurrentLog.logException(e);
}
Expand Down Expand Up @@ -214,24 +219,12 @@ public static serverObjects respond(final RequestHeader header, final serverObje
deleteOnRecrawl = RecrawlBusyThread.DEFAULT_DELETE_ON_RECRAWL;
}
} else {
if (post.containsKey("stoprecrawl")) {
/* We do not remove the thread from the Switchboard worker threads using serverSwitch.terminateThread(String,boolean),
* because we want to be able to provide a report after its termination */
recrawlbt.terminate(false);
prop.put("recrawljobrunning", 0);
if (sb.tables != null) {
final Row recrawlCall = WorkTables.selectLastExecutedApiCall(IndexReIndexMonitor_p.SERVLET_NAME, post, sb);
if (recrawlCall != null) {
recrawlCall.put(WorkTables.TABLE_API_COL_APICALL_EVENT_KIND, "off");
recrawlCall.put(WorkTables.TABLE_API_COL_APICALL_EVENT_ACTION, "startup");
recrawlCall.put(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, "");
try {
sb.tables.update(WorkTables.TABLE_API_NAME, recrawlCall);
} catch (final IOException e) {
ConcurrentLog.logException(e);
}
}
}
if (post.containsKey("stoprecrawl")) {
/* We do not remove the thread from the Switchboard worker threads using serverSwitch.terminateThread(String,boolean),
* because we want to be able to provide a report after its termination */
recrawlbt.terminate(false);
prop.put("recrawljobrunning", 0);
deleteTrackedRecrawlStartupApiCall(sb);
}
}

Expand Down Expand Up @@ -385,4 +378,21 @@ protected static String formatDateTime(final DateTimeFormatter formatter, final
}
return formattedTime;
}

private static void deleteTrackedRecrawlStartupApiCall(final Switchboard sb) {
if (sb == null || sb.tables == null) {
return;
}
final String trackedPk = sb.getConfig(RECRAWL_STARTUP_APICALL_PK_CONFIG, "");
if (trackedPk.isEmpty()) {
return;
}
try {
sb.tables.delete(WorkTables.TABLE_API_NAME, UTF8.getBytes(trackedPk));
} catch (final IOException e) {
ConcurrentLog.logException(e);
} finally {
sb.setConfig(RECRAWL_STARTUP_APICALL_PK_CONFIG, "");
}
}
}