codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Fixed bug in ingest cancellation code

Browse Source
This commit is contained in:
Richard Cordovano
2014-04-02 14:58:35 -04:00
parent 1ac49ea073
commit fbf7fe329b
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Core/0 Executable file
View File

Binary file not shown.

2
Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
View File

@@ -167,6 +167,7 @@ final class IngestJob {
dataSourceIngestPipelines.remove(threadId);
if (dataSourceIngestPipelines.isEmpty() && dataSourceTaskProgress != null) {
dataSourceTaskProgress.finish();
dataSourceTaskProgress = null;
}
FileIngestPipeline fileIngestPipeline = fileIngestPipelines.get(threadId);
@@ -176,6 +177,7 @@ final class IngestJob {
fileIngestPipelines.remove(threadId);
if (fileIngestPipelines.isEmpty() && fileTasksProgress != null) {
fileTasksProgress.finish();
fileTasksProgress = null;
}
return errors;

17
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@@ -306,12 +306,17 @@ public class IngestManager {
}
synchronized void reportThreadDone(long threadId) {
List<Long> completedJobs = new ArrayList<>();
for (IngestJob job : ingestJobs.values()) {
job.releaseIngestPipelinesForThread(threadId);
if (job.areIngestPipelinesShutDown()) {
ingestJobs.remove(job.getId());
completedJobs.add(job.getId());
}
}
for (Long jobId : completedJobs) {
ingestJobs.remove(jobId);
}
}
synchronized void stopAll() {
@@ -334,9 +339,17 @@ public class IngestManager {
// Cancel the worker threads.
if (dataSourceTaskWorker != null) {
dataSourceTaskWorker.cancel(true);
while (!dataSourceTaskWorker.isDone()) {
// Wait.
}
dataSourceTaskWorker = null;
}
if (fileTaskWorker != null) {
fileTaskWorker.cancel(true);
while (!fileTaskWorker.isDone()) {
// Wait.
}
fileTaskWorker = null;
}
// Jettision the remaining tasks. This will dispose of any tasks that
@@ -502,7 +515,6 @@ public class IngestManager {
logger.log(Level.INFO, "Data source ingest thread (id={0}) cancelled", this.id);
return null;
}
IngestJob job = scheduler.next();
DataSourceIngestPipeline pipeline = job.getDataSourceIngestPipelineForThread(this.id);
pipeline.process(this, job.getDataSourceTaskProgressBar());
@@ -544,7 +556,6 @@ public class IngestManager {
IngestScheduler.FileScheduler fileScheduler = IngestScheduler.getInstance().getFileScheduler();
while (fileScheduler.hasNext()) {
if (isCancelled()) {
IngestManager.getInstance().reportThreadDone(this.id);
logger.log(Level.INFO, "File ingest thread (id={0}) cancelled", this.id);
return null;
}