diff --git a/defaults/yacy.init b/defaults/yacy.init index ac1ae07a6..26f39e883 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -655,6 +655,11 @@ collection=user 90_cleanup_memprereq=0 90_cleanup_loadprereq=16.0 +reindexSolr_idlesleep=1000 +reindexSolr_busysleep=1 +reindexSolr_memprereq=10485760 +reindexSolr_loadprereq=9.0 + # additional attributes: # performanceIO is a percent-value. a value of 10 means, that 10% of the busysleep time # is used to flush the RAM cache, which is the major part of the IO in YaCy diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java index 869b22e6b..f54ba3989 100644 --- a/source/net/yacy/migration.java +++ b/source/net/yacy/migration.java @@ -305,17 +305,13 @@ public class migration { omitFields.add(CollectionSchema.coordinate_p_0_coordinate.getSolrFieldName()); omitFields.add(CollectionSchema.coordinate_p_1_coordinate.getSolrFieldName()); omitFields.add("_version_"); // exclude internal Solr std. field from obsolete check - Collection vocs = LibraryProvider.autotagging.getVocabularies(); - for (Tagging v: vocs) { //exclude configured vocabulary index fields (not in CollectionSchema but valid) - omitFields.add(CollectionSchema.VOCABULARY_PREFIX + v.getName() + CollectionSchema.VOCABULARY_TERMS_SUFFIX); - } CollectionConfiguration colcfg = Switchboard.getSwitchboard().index.fulltext().getDefaultConfiguration(); ReindexSolrBusyThread reidx = new ReindexSolrBusyThread(null); // ("*:*" would reindex all); try { // get all fields contained in index Collection solrfields = Switchboard.getSwitchboard().index.fulltext().getDefaultEmbeddedConnector().getFields(); for (FieldInfo solrfield : solrfields) { - if (!colcfg.contains(solrfield.getName()) && !omitFields.contains(solrfield.getName())) { // add found fields not in config for reindexing + if (!colcfg.contains(solrfield.getName()) && !omitFields.contains(solrfield.getName()) && !solrfield.getName().startsWith(CollectionSchema.VOCABULARY_PREFIX)) { // add found fields not in config for reindexing but omit the vocabulary fields reidx.addSelectFieldname(solrfield.getName()); } }