Merge pull request #61 from DataONEorg/feature-MC1665-k8s-testsuite-a…

…daptations

increase index.solr.versionConflict.max.attempts

helm/config/dataone-indexer.properties

@@ -43,4 +43,4 @@ index.resourcemap.waitingComponent.max.attempts=25
 #Time (milliseconds) indexer will wait to grab a newer version of solr doc after a version conflict
 index.solr.versionConflict.waiting.time=500
 #Number of the times the indexer tries to get a newer version of solr doc after a version conflict
-index.solr.versionConflict.max.attempts=5
+index.solr.versionConflict.max.attempts=25

src/main/java/org/dataone/cn/indexer/SolrIndex.java

@@ -84,9 +84,12 @@ public class SolrIndex {
     public static final String ID = "id";
     private static final String IDQUERY = ID+":*";
     private static final String VERSION_CONFLICT = "version conflict";
-    private static final int VERSION_CONFLICT_MAX_ATTEMPTS = Settings.getConfiguration().getInt("index.solr.versionConflict.max.attempts", 5);
-    private static final int VERSION_CONFICT_WAITING = Settings.getConfiguration().getInt("index.solr.versionConflict.waiting.time", 500); //milliseconds
-    private static final List<String> resourceMapFormatIdList = Settings.getConfiguration().getList("index.resourcemap.namespace");
+    private static final int VERSION_CONFLICT_MAX_ATTEMPTS = Settings.getConfiguration().getInt(
+        "index.solr.versionConflict.max.attempts", 25);
+    private static final int VERSION_CONFICT_WAITING = Settings.getConfiguration().getInt(
+        "index.solr.versionConflict.waiting.time", 500); //milliseconds
+    private static final List<String> resourceMapFormatIdList = Settings.getConfiguration().getList(
+        "index.resourcemap.namespace");
     private static List<IDocumentSubprocessor> subprocessors = null;
     private static List<IDocumentDeleteSubprocessor> deleteSubprocessors = null;
     private static SolrClient solrServer = null;

src/main/resources/org/dataone/configuration/index-processor.properties

@@ -30,12 +30,12 @@ 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=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=5
+index.solr.versionConflict.max.attempts=25
 
 dataone.indexing.performance.logging.enabled=false
 
 D1Client.CN_URL=https://cn.dataone.org/cn
 
 index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;http://www.openarchives.org/ore/terms
 
-dataone.mn.registration.serviceType.url=https://cn.dataone.org/mnServiceTypes.xml
+dataone.mn.registration.serviceType.url=https://cn.dataone.org/mnServiceTypes.xml

src/test/resources/org/dataone/configuration/index-processor-2.properties

@@ -21,7 +21,7 @@ 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=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=5
+index.solr.versionConflict.max.attempts=25
 #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.
@@ -41,4 +41,4 @@ index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;http://www.o
 
 dataone.mn.registration.serviceType.url=https://cn-sandbox-ucsb-1.test.dataone.org/mnServiceTypes.xml
 
-cn.router.hostname2=cn.dataone.org
+cn.router.hostname2=cn.dataone.org

src/test/resources/org/dataone/configuration/index-processor.properties

@@ -21,7 +21,7 @@ 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=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=5
+index.solr.versionConflict.max.attempts=25
 #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.
@@ -41,4 +41,4 @@ index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;http://www.o
 
 dataone.mn.registration.serviceType.url=https://cn-sandbox-ucsb-1.test.dataone.org/mnServiceTypes.xml
 
-cn.router.hostname=cn.dataone.org
+cn.router.hostname=cn.dataone.org