Produced by Araxis Merge on 10/2/2017 1:40:11 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\project_cookbooks\vx_solr\templates\default | solr.in.sh.erb | Wed May 17 15:07:59 2017 UTC |
| 2 | chef-repo.zip\chef-repo\project_cookbooks\vx_solr\templates\default | solr.in.sh.erb | Mon Oct 2 15:34:08 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 226 |
| Changed | 2 | 6 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | # Licensed to the Ap ache Softw are Founda tion (ASF) under one or more | |
| 2 | # contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h | |
| 3 | # this wor k for addi tional inf ormation r egarding c opyright o wnership. | |
| 4 | # The ASF licenses t his file t o You unde r the Apac he License , Version 2.0 | |
| 5 | # (the "Li cense"); y ou may not use this file excep t in compl iance with | |
| 6 | # the Lice nse. You may obtain a copy of the Licen se at | |
| 7 | # | |
| 8 | # http ://www.apa che.org/li censes/LIC ENSE-2.0 | |
| 9 | # | |
| 10 | # Unless r equired by applicabl e law or a greed to i n writing, software | |
| 11 | # distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS, | |
| 12 | # WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied. | |
| 13 | # See the License fo r the spec ific langu age govern ing permis sions and | |
| 14 | # limitati ons under the Licens e. | |
| 15 | ||
| 16 | # By defau lt the scr ipt will u se JAVA_HO ME to dete rmine whic h java | |
| 17 | # to use, but you ca n set a sp ecific pat h for Solr to use wi thout | |
| 18 | # affectin g other Ja va applica tions on y our server /workstati on. | |
| 19 | #SOLR_JAVA _HOME="" | |
| 20 | ||
| 21 | # Increase Java Min/ Max Heap a s needed t o support your index ing / quer y needs | |
| 22 | <% if !@so lr_heap.ni l? %> | |
| 23 | SOLR_HEAP= "<%= @solr _heap %>" | |
| 24 | <% end %> | |
| 25 | ||
| 26 | # Enable v erbose GC logging | |
| 27 | #GC_LOG_OP TS="-verbo se:gc -XX: +PrintHeap AtGC -XX:+ PrintGCDet ails \ | |
| 28 | #-XX:+Prin tGCDateSta mps -XX:+P rintGCTime Stamps -XX :+PrintTen uringDistr ibution -X X:+PrintGC Applicatio nStoppedTi me" | |
| 29 | # Disable GC logging which isn 't very us eful and c onsumes a lot of dis k space | |
| 30 | GC_LOG_OPT S="" | |
| 31 | ||
| 32 | # These GC settings have shown to work w ell for a number of common Sol r workload s | |
| 33 | GC_TUNE="- XX:NewRati o=3 \ | |
| 34 | -XX:Surviv orRatio=4 \ | |
| 35 | -XX:Target SurvivorRa tio=90 \ | |
| 36 | -XX:MaxTen uringThres hold=8 \ | |
| 37 | -XX:+UseCo ncMarkSwee pGC \ | |
| 38 | -XX:+UsePa rNewGC \ | |
| 39 | -XX:ConcGC Threads=4 -XX:Parall elGCThread s=4 \ | |
| 40 | -XX:+CMSSc avengeBefo reRemark \ | |
| 41 | -XX:Preten ureSizeThr eshold=64m \ | |
| 42 | -XX:+UseCM SInitiatin gOccupancy Only \ | |
| 43 | -XX:CMSIni tiatingOcc upancyFrac tion=70 \ | |
| 44 | -XX:CMSMax AbortableP recleanTim e=6000 \ | |
| 45 | -XX:+CMSPa rallelRema rkEnabled \ | |
| 46 | -XX:+Paral lelRefProc Enabled \ | |
| 47 | -XX:+UseNU MA \ | |
| 48 | -XX:CMSFul lGCsBefore Compaction =1 \ | |
| 49 | -XX:CMSTri ggerPermRa tio=80 \ | |
| 50 | -XX:+UseLa rgePages" | |
| 51 | ||
| 52 | # Set the ZooKeeper connection string if using an external Z ooKeeper e nsemble | |
| 53 | # e.g. hos t1:2181,ho st2:2181/c hroot | |
| 54 | # Leave em pty if not using Sol rCloud | |
| 55 | #ZK_HOST=" " | |
| 56 | ||
| 57 | # Set the ZooKeeper client tim eout (for SolrCloud mode) | |
| 58 | <% if !@zk _client_ti meout.nil? %> | |
| 59 | ZK_CLIENT_ TIMEOUT="< %= @zk_cli ent_timeou t %>" | |
| 60 | <% end %> | |
| 61 | ||
| 62 | # By defau lt the sta rt script uses "loca lhost"; ov erride the hostname here | |
| 63 | # for prod uction Sol rCloud env ironments to control the hostn ame expose d to clust er state | |
| 64 | #SOLR_HOST ="192.168. 1.1" | |
| 65 | <% if !@so lr_host.ni l? %> | |
| 66 | SOLR_HOST= "<%= @solr _host %>" | |
| 67 | <% end %> | |
| 68 | ||
| 69 | # By defau lt the sta rt script uses UTC; override t he timezon e if neede d | |
| 70 | #SOLR_TIME ZONE="UTC" | |
| 71 | ||
| 72 | # Set to t rue to act ivate the JMX RMI co nnector to allow rem ote JMX cl ient appli cations | |
| 73 | # to monit or the JVM hosting S olr; set t o "false" to disable that beha vior | |
| 74 | # (false i s recommen ded in pro duction en vironments ) | |
| 75 | ENABLE_REM OTE_JMX_OP TS="false" | |
| 76 | ||
| 77 | # The scri pt will us e SOLR_POR T+10000 fo r the RMI_ PORT or yo u can set it here | |
| 78 | # RMI_PORT = PORT | |
| 79 | ||
| 80 | # Anything you add t o the SOLR _OPTS vari able will be include d in the j ava | |
| 81 | # start co mmand line as-is, in ADDITION to other o ptions. If you speci fy the | |
| 82 | # -a optio n on start script, t hose optio ns will be appended as well. E xamples: | |
| 83 | #SOLR_OPTS ="$SOLR_OP TS -Dsolr. autoSoftCo mmit.maxTi me=3000" | |
| 84 | #SOLR_OPTS ="$SOLR_OP TS -Dsolr. autoCommit .maxTime=6 0000" | |
| 85 | #SOLR_OPTS ="$SOLR_OP TS -Dsolr. clustering .enabled=t rue" | |
| 86 | ||
| 87 | # Location where the bin/solr script wil l save PID files for running i nstances | |
| 88 | # If not s et, the sc ript will create PID files in $SOLR_TIP/ bin | |
| 89 | #SOLR_PID_ DIR= | |
| 90 | ||
| 91 | # Path to a director y where So lr creates index fil es, the sp ecified di rectory | |
| 92 | # must con tain a sol r.xml; by default, S olr will u se server/ solr | |
| 93 | #SOLR_HOME = | |
| 94 | ||
| 95 | # Solr pro vides a de fault Log4 J configur ation prop erties fil e in serve r/resource s | |
| 96 | # however, you may w ant to cus tomize the log setti ngs and fi le appende r location | |
| 97 | # so you c an point t he script to use a d ifferent l og4j.prope rties file | |
| 98 | #LOG4J_PRO PS=/var/so lr/log4j.p roperties | |
| 99 | ||
| 100 | # Location where Sol r should w rite logs to; should agree wit h the file appender | |
| 101 | # settings in server /resources /log4j.pro perties | |
| 102 | SOLR_LOGS_ DIR=<%= @s olr_log_di r %> | |
| 103 | ||
| 104 | # Sets the port Solr binds to, default i s PORT | |
| 105 | #SOLR_PORT = PORT | |
| 106 | ||
| 107 | # Uncommen t to set S SL-related system pr operties | |
| 108 | # Be sure to update the paths to the cor rect keyst ore for yo ur environ ment | |
| 109 | #SOLR_SSL_ OPTS="-Dja vax.net.ss l.keyStore =etc/solr- ssl.keysto re.jks \ | |
| 110 | #-Djavax.n et.ssl.key StorePassw ord=secret \ | |
| 111 | #-Djavax.n et.ssl.tru stStore=et c/solr-ssl .keystore. jks \ | |
| 112 | #-Djavax.n et.ssl.tru stStorePas sword=secr et" | |
| 113 | ||
| 114 | # Uncommen t to set a specific SSL port ( -Djetty.ss l.port=N); if not se t | |
| 115 | # and you are using SSL, then the start script wil l use SOLR _PORT for the SSL po rt | |
| 116 | #SOLR_SSL_ PORT= |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.