mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

7683 make one ingest job per data source

Browse Source
This commit is contained in:
Richard Cordovano 2021-07-28 14:47:53 -04:00
parent abd903260a
commit ffe10a3052
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,15 +220,15 @@ public final class IngestJob {
/** /**
* Gets a snapshot of the progress of this ingest job. * Gets a snapshot of the progress of this ingest job.
* *
* @param getIngestTasksSnapshot Whether or not to include an ingest tasks * @param includeIngestTasksSnapshot Whether or not to include ingest task
* snapshot. * stats in the snapshot.
* *
* @return The snapshot, will be null if the job is not started yet. * @return The snapshot, will be null if the job is not started yet.
*/ */
public ProgressSnapshot getSnapshot(boolean getIngestTasksSnapshot) { public ProgressSnapshot getSnapshot(boolean includeIngestTasksSnapshot) {
ProgressSnapshot snapshot = null; ProgressSnapshot snapshot = null;
if (ingestJobPipeline != null) { if (ingestJobPipeline != null) {
return new ProgressSnapshot(getIngestTasksSnapshot); return new ProgressSnapshot(includeIngestTasksSnapshot);
} }
return snapshot; return snapshot;
} }
@ -241,7 +241,7 @@ public final class IngestJob {
Snapshot getDiagnosticStatsSnapshot() { Snapshot getDiagnosticStatsSnapshot() {
Snapshot snapshot = null; Snapshot snapshot = null;
if (ingestJobPipeline != null) { if (ingestJobPipeline != null) {
snapshot = ingestJobPipeline.getSnapshot(true); snapshot = ingestJobPipeline.getDiagnosticStatsSnapshot(true);
} }
return snapshot; return snapshot;
} }
@ -410,13 +410,16 @@ public final class IngestJob {
/** /**
* Constructs a snapshot of the progress of an ingest job. * Constructs a snapshot of the progress of an ingest job.
*
* @param includeIngestTasksSnapshot Whether or not to include ingest
* task stats in the snapshot.
*/ */
private ProgressSnapshot(boolean getIngestTasksSnapshot) { private ProgressSnapshot(boolean includeIngestTasksSnapshot) {
/* /*
* Note that the getSnapshot() will not construct a ProgressSnapshot * Note that the getSnapshot() will not construct a ProgressSnapshot
* if ingestJobPipeline is null. * if ingestJobPipeline is null.
*/ */
Snapshot snapshot = ingestJobPipeline.getSnapshot(getIngestTasksSnapshot); Snapshot snapshot = ingestJobPipeline.getDiagnosticStatsSnapshot(includeIngestTasksSnapshot);
dataSourceProcessingSnapshot = new DataSourceProcessingSnapshot(snapshot); dataSourceProcessingSnapshot = new DataSourceProcessingSnapshot(snapshot);
jobCancellationRequested = IngestJob.this.isCancelled(); jobCancellationRequested = IngestJob.this.isCancelled();
jobCancellationReason = IngestJob.this.getCancellationReason(); jobCancellationReason = IngestJob.this.getCancellationReason();

13
Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java
View File

@ -1516,11 +1516,14 @@ final class IngestJobPipeline {
} }
/** /**
* Gets a snapshot of this ingest pipelines current state. * Gets a snapshot of some basic diagnostic statistics for this ingest
* pipeline.
* *
* @return An ingest job statistics object. * @param includeIngestTasksSnapshot
*
* @return The snapshot.
*/ */
Snapshot getSnapshot(boolean getIngestTasksSnapshot) { Snapshot getDiagnosticStatsSnapshot(boolean includeIngestTasksSnapshot) {
/** /**
* Determine whether file ingest is running at the time of this snapshot * Determine whether file ingest is running at the time of this snapshot
* and determine the earliest file ingest level pipeline start time, if * and determine the earliest file ingest level pipeline start time, if
@ -1542,7 +1545,7 @@ final class IngestJobPipeline {
long estimatedFilesToProcessCount = 0; long estimatedFilesToProcessCount = 0;
long snapShotTime = new Date().getTime(); long snapShotTime = new Date().getTime();
IngestJobTasksSnapshot tasksSnapshot = null; IngestJobTasksSnapshot tasksSnapshot = null;
if (getIngestTasksSnapshot) { if (includeIngestTasksSnapshot) {
synchronized (fileIngestProgressLock) { synchronized (fileIngestProgressLock) {
processedFilesCount = this.processedFiles; processedFilesCount = this.processedFiles;
estimatedFilesToProcessCount = this.estimatedFilesToProcess; estimatedFilesToProcessCount = this.estimatedFilesToProcess;
@ -1551,7 +1554,7 @@ final class IngestJobPipeline {
tasksSnapshot = taskScheduler.getTasksSnapshotForJob(getIngestJobId()); tasksSnapshot = taskScheduler.getTasksSnapshotForJob(getIngestJobId());
} }
return new Snapshot(dataSource.getName(), return new Snapshot(dataSource.getName(),
getIngestJobId(), createTime, getIngestJobId(), createTime,
getCurrentDataSourceIngestModule(), getCurrentDataSourceIngestModule(),
fileIngestRunning, fileIngestStartTime, fileIngestRunning, fileIngestStartTime,