Skip to content

Track search work by container; purge on delete #2577

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

Closed
labkey-jeckels wants to merge 5 commits into from
Closed

Track search work by container; purge on delete #2577

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e24776
Track search work by container; purge on delete
labkey-jeckels Jul 23, 2025
af54033
Merge branch 'release25.7-SNAPSHOT' into 25.7_fb_searchPurge
labkey-jeckels Jul 24, 2025
dd0053f
Revamp priorities
labkey-jeckels Jul 25, 2025
726d8b8
Simplify priorities - flatten list and prioritize Resources over Runn…
labkey-jeckels Jul 28, 2025
972df94
Merge branch 'release25.7-SNAPSHOT' into 25.7_fb_searchPurge
labkey-jeckels Jul 30, 2025
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
17 changes: 12 additions & 5 deletions src/org/labkey/test/util/search/SearchAdminAPIHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
public abstract class SearchAdminAPIHelper
{

@LogMethod(quiet = true)
public static void purgeForContainer(String containerPath)
{
var cmd = new SimplePostCommand("search", "cancelIndexing");
executeCommand(cmd, containerPath);
}

public static void waitForIndexer()
{
waitForIndexer(WAIT_FOR_PAGE);
Expand All @@ -57,7 +64,7 @@ public static void waitForIndexer(int timeout)
var cmd = new SimplePostCommand("search", "waitForIndexer");
cmd.setTimeout(timeout);

executeWaitForIndexer(cmd);
executeCommand(cmd, null);
}

public static void waitForIndexerBackground()
Expand All @@ -71,9 +78,9 @@ public static void waitForIndexerBackground(int timeout)
// Invoke a special server action that waits until all previous indexer tasks are complete, even wait for background indexing tasks to complete (e.g. deleteContainer)
var cmd = new SimplePostCommand("search", "waitForIndexer");
cmd.setTimeout(timeout);
cmd.setParameters(Map.of("priority", "background"));
cmd.setParameters(Map.of("priority", "idle"));

executeWaitForIndexer(cmd);
executeCommand(cmd, null);
}

@LogMethod(quiet = true)
Expand Down Expand Up @@ -106,11 +113,11 @@ public static void waitForSearchServiceBootstrap(Connection cn)
while (!timer.isTimedOut());
}

private static void executeWaitForIndexer(PostCommand cmd)
private static void executeCommand(PostCommand<?> cmd, String containerPath)
{
try
{
var response = cmd.execute(WebTestHelper.getRemoteApiConnection(), null);
var response = cmd.execute(WebTestHelper.getRemoteApiConnection(), containerPath);
assertEquals("WaitForIndexer action timed out", HttpStatus.SC_OK, response.getStatusCode());
} catch (Exception cmdException)
{
Expand Down