Show
Ignore:
Timestamp:
10.11.2016 22:58:19 (3 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:
2 modified

Legend:

Unmodified
Added
Removed
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/ef-solr.properties

    r31095 r31100  
    33wcsa-ef-ingest.process-ef-json-mode = per-page 
    44 
    5 #wcsa-ef-ingest.solr-endpoint-ips = 10.11.0.53,10.11.0.54,10.11.0.55 
    6 wcsa-ef-ingest.solr-endpoint-ips = gc0,gc1,gc2,gc3,gc4,gc5,gc6,gc7,gc8,gc9 
     5#wcsa-ef-ingest.solr-clode-nodes = 10.11.0.53:8983,10.11.0.54:8983,10.11.0.55:8983 
     6wcsa-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 
    77wcsa-ef-ingest.strict-file-io = false 
    88 
     
    1717wcsa-ef-ingest.num-partitions = 120 
    1818 
    19  
     19spark.executor.cores=11 
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

    r31095 r31100  
    7070         
    7171        if (_solr_url != null) { 
    72             String solr_endpoint_ips = System.getProperty("wcsa-ef-ingest.solr-endpoint-ips",null); 
    73             if (solr_endpoint_ips != null) { 
    74                 String [] ips = solr_endpoint_ips.split(","); 
    75                 for (String ip : ips) { 
    76                     String solr_endpoint = _solr_url.replaceFirst("//.*?:", "//"+ip+":"); 
     72            String solr_cloud_nodes = System.getProperty("wcsa-ef-ingest.solr-cloud-nodes",null); 
     73            if (solr_cloud_nodes != null) { 
     74                String [] cloud_nodes = solr_cloud_nodes.split(","); 
     75                for (String cn : cloud_nodes) { 
     76                    String solr_endpoint = _solr_url.replaceFirst("//.*?:\\d+/", "//"+cn+"/"); 
    7777                    solr_endpoints.add(solr_endpoint); 
    7878                }