Skip to content

Commit 7db7c21

Browse files
committed
Update default for JBrowse lucene cores
1 parent d9ac32c commit 7db7c21

File tree

3 files changed

+37
-3
lines changed

3 files changed

+37
-3
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,7 @@ public void getOrphanFilesForContainer(Container c, User u, Set<File> orphanFile
425425
@Override
426426
public boolean accept(File pathname)
427427
{
428-
//50mb
429-
return (pathname.length() >= 5e7);
428+
return (pathname.length() >= 5e3);
430429
}
431430
});
432431

jbrowse/resources/module.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<module xmlns="http://labkey.org/moduleProperties/xml/">
2+
<properties>
3+
<propertyDescriptor name="JBrowseLuceneCores">
4+
<canSetPerContainer>false</canSetPerContainer>
5+
<defaultValue>1</defaultValue>
6+
<description>The number of cores to allow for lucene searches</description>
7+
<editPermissions>
8+
<permission>ADMIN</permission>
9+
</editPermissions>
10+
</propertyDescriptor>
11+
</properties>
12+
<clientDependencies>
13+
14+
</clientDependencies>
15+
</module>

jbrowse/src/org/labkey/jbrowse/JBrowseServiceImpl.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.labkey.jbrowse;
22

33
import org.apache.commons.lang3.StringUtils;
4+
import org.apache.commons.lang3.math.NumberUtils;
45
import org.apache.logging.log4j.Logger;
56
import org.jetbrains.annotations.Nullable;
67
import org.json.JSONObject;
78
import org.labkey.api.collections.CaseInsensitiveHashMap;
89
import org.labkey.api.data.Container;
10+
import org.labkey.api.data.ContainerManager;
911
import org.labkey.api.data.SimpleFilter;
1012
import org.labkey.api.data.TableInfo;
1113
import org.labkey.api.data.TableSelector;
@@ -17,7 +19,9 @@
1719
import org.labkey.api.jbrowse.JBrowseFieldCustomizer;
1820
import org.labkey.api.jbrowse.JBrowseFieldDescriptor;
1921
import org.labkey.api.jbrowse.JBrowseService;
22+
import org.labkey.api.module.Module;
2023
import org.labkey.api.module.ModuleLoader;
24+
import org.labkey.api.module.ModuleProperty;
2125
import org.labkey.api.pipeline.PipeRoot;
2226
import org.labkey.api.pipeline.PipelineJobException;
2327
import org.labkey.api.pipeline.PipelineService;
@@ -436,7 +440,23 @@ public boolean isAvailable(Container c)
436440
}
437441
}
438442

443+
private static final String JBrowseLuceneCoresProp = "JBrowseLuceneCores";
444+
439445
public int getCoresForLuceneSearches() {
440-
return Runtime.getRuntime().availableProcessors();
446+
Module m = ModuleLoader.getInstance().getModule(JBrowseModule.NAME);
447+
ModuleProperty mp = m.getModuleProperties().get(JBrowseLuceneCoresProp);
448+
String nCores = StringUtils.trimToNull(mp.getEffectiveValue(ContainerManager.getRoot()));
449+
if (nCores == null)
450+
{
451+
return 1;
452+
}
453+
else if (!NumberUtils.isCreatable(nCores))
454+
{
455+
_log.error("Improper value for " + JBrowseLuceneCoresProp + ": " + nCores);
456+
}
457+
458+
Number n = NumberUtils.createNumber(nCores);
459+
460+
return n.intValue();
441461
}
442462
}

0 commit comments

Comments
 (0)