Skip to content

Commit 99e0f6b

Browse files
committed
Bugfix genome caching
1 parent 9f2d28c commit 99e0f6b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AlignerIndexUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static void saveCachedIndex(boolean hasCachedIndex, PipelineContext ctx,
184184

185185
lockFile.delete();
186186

187-
ReferenceGenomeManager.get().markGenomeModified(genome);
187+
ReferenceGenomeManager.get().markGenomeModified(genome, ctx.getLogger());
188188
}
189189
catch (IOException e)
190190
{

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/ReferenceGenomeManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ private boolean isUpToDate(ReferenceGenome genome)
5757
long lastUpdated = localFile.lastModified();
5858
long lastSync = remoteFile.lastModified();
5959

60-
return lastUpdated >= lastSync;
60+
return lastSync >= lastUpdated;
6161
}
6262

63-
public void markGenomeModified(ReferenceGenome genome) throws IOException
63+
public void markGenomeModified(ReferenceGenome genome, Logger log) throws IOException
6464
{
6565
File toUpdate = getLocalUpdateFile(genome);
66+
log.info("Marking genome as modified: " + toUpdate.getPath());
6667
FileUtils.touch(toUpdate);
6768
}
6869

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/CreateReferenceLibraryTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public RecordedActionSet run() throws PipelineJobException
384384
getJob().getLogger().info("creation complete");
385385

386386
ReferenceGenome rg = SequenceAnalysisService.get().getReferenceGenome(rowId, getJob().getUser());
387-
ReferenceGenomeManager.get().markGenomeModified(rg);
387+
ReferenceGenomeManager.get().markGenomeModified(rg, getJob().getLogger());
388388

389389
Set<GenomeTrigger> triggers = new HashSet<>(getPipelineJob().getExtraTriggers());
390390
if (getPipelineJob().isSkipTriggers())

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ImportGenomeTrackTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public RecordedActionSet run() throws PipelineJobException
143143
}
144144

145145
final int trackId = addTrackForLibrary(getPipelineJob().getTrack(), getPipelineJob().getTrackName(), getPipelineJob().getTrackDescription(), action);
146-
ReferenceGenomeManager.get().markGenomeModified(SequenceAnalysisService.get().getReferenceGenome(getPipelineJob().getLibraryId(), getJob().getUser()));
146+
ReferenceGenomeManager.get().markGenomeModified(SequenceAnalysisService.get().getReferenceGenome(getPipelineJob().getLibraryId(), getJob().getUser()), getJob().getLogger());
147147

148148
Set<GenomeTrigger> triggers = SequenceAnalysisServiceImpl.get().getGenomeTriggers();
149149
if (!triggers.isEmpty())

0 commit comments

Comments
 (0)