wait timeout

This commit is contained in:
Greg DiCristofaro 2022-06-14 16:19:21 -04:00
parent d73e46ff80
commit bc86a6a671
2 changed files with 10 additions and 8 deletions

View File

@ -511,13 +511,15 @@ public class CommandLineIngestManager extends CommandLineManager {
IngestJob ingestJob = ingestJobStartResult.getJob(); IngestJob ingestJob = ingestJobStartResult.getJob();
if (null != ingestJob) { if (null != ingestJob) {
/* /*
* Block until notified by the ingest job event * Block until notified by the ingest job event listener
* listener or until interrupted because auto ingest * or until interrupted because auto ingest is shutting
* is shutting down. * down. For very small jobs, it is possible that ingest has
* completed by the time we get here, so check periodically
* in case the event was missed.
*/ */
do { while (IngestManager.getInstance().isIngestRunning()) {
ingestLock.wait(); ingestLock.wait(60000); // Check every minute
} while (IngestManager.getInstance().isIngestRunning()); }
LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath()); LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath());
IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();

View File

@ -2819,7 +2819,7 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
* in case the event was missed. * in case the event was missed.
*/ */
while (IngestManager.getInstance().isIngestRunning()) { while (IngestManager.getInstance().isIngestRunning()) {
ingestLock.wait(300000); // Check every five minutes ingestLock.wait(60000); // Check every minute
} }
IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot(); IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot();