Merge pull request #1585 from NCEAS/develop

The third merge for 2.18.0 from develop to main

lib/metacat.properties

@@ -822,13 +822,13 @@ index.hazelcast.indexeventmap=hzIndexEventMap
 index.tdb.directory=/var/metacat/tdb
 index.accessLog.count.enabled=false
 #The time (millisecond) that the resource map processor waits for the solr doc readiness of its components 
-index.resourcemap.waitingComponent.time=300
+index.resourcemap.waitingComponent.time=600
 #The number of the attempts that the resource map processor tries to wait for the solr doc readiness of its components
-index.resourcemap.waitingComponent.max.attempts=5
+index.resourcemap.waitingComponent.max.attempts=15
 #The time (millisecond) that indexer will wait to grab a newer version of solr doc when a version conflict happened 
-index.solr.versionConflict.waiting.time=200
+index.solr.versionConflict.waiting.time=500
 #The number of the attempts that indexer tries to grab a newer version of solr doc when a version conflict happened 
-index.solr.versionConflict.max.attempts=2
+index.solr.versionConflict.max.attempts=5
 #You may specify the exact number of threads the indexer will use. 
 #If you keep it blank, Metacat will use the default one - the system processors number minus one. If calculation result is 0, 1 will be used as the default value.
 #If the one you specify exceeds the default number or is less than 1, the default one will be used as well.