Changeset 31100

Timestamp:

2016-11-10T22:58:19+13:00 (7 years ago)

Author:

davidb

Message:

Change to using solr-cloud-nodes that include port number

Location:

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest

Files:

• ef-solr.properties (modified) (2 diffs)
• src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java (modified) (1 diff)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/ef-solr.properties

@@ -3 +3 @@
 wcsa-ef-ingest.process-ef-json-mode = per-page
 
-#wcsa-ef-ingest.solr-endpoint-ips = 10.11.0.53,10.11.0.54,10.11.0.55
-wcsa-ef-ingest.solr-endpoint-ips = gc0,gc1,gc2,gc3,gc4,gc5,gc6,gc7,gc8,gc9
+#wcsa-ef-ingest.solr-clode-nodes = 10.11.0.53:8983,10.11.0.54:8983,10.11.0.55:8983
+wcsa-ef-ingest.solr-cloud-nodes = gc0:8983,gc1:8983,gc2:8983,gc3:8983,gc4:8983,gc5:8983,gc6:8983,gc7:8983,gc8:8983,gc9:8983
 wcsa-ef-ingest.strict-file-io = false
 
@@ -17 +17 @@
 wcsa-ef-ingest.num-partitions = 120
 
-
+spark.executor.cores=11

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

@@ -70 +70 @@
         
         if (_solr_url != null) {
-            String solr_endpoint_ips = System.getProperty("wcsa-ef-ingest.solr-endpoint-ips",null);
-            if (solr_endpoint_ips != null) {
-                String [] ips = solr_endpoint_ips.split(",");
-                for (String ip : ips) {
-                    String solr_endpoint = _solr_url.replaceFirst("//.*?:", "//"+ip+":");
+            String solr_cloud_nodes = System.getProperty("wcsa-ef-ingest.solr-cloud-nodes",null);
+            if (solr_cloud_nodes != null) {
+                String [] cloud_nodes = solr_cloud_nodes.split(",");
+                for (String cn : cloud_nodes) {
+                    String solr_endpoint = _solr_url.replaceFirst("//.*?:\\d+/", "//"+cn+"/");
                     solr_endpoints.add(solr_endpoint);
                 }