Merge pull request #17 from idealista/develop

Develop
idealista · Mar 16, 2017 · e80a246 · e80a246
2 parents 94907e8 + 9050c40
commit e80a246
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [Unreleased](https://github.com/idealista-tech/solrcloud-role/tree/develop)
+
+## [1.4.0](https://github.com/idealista-tech/solrcloud-role/tree/1.4.0) (2017-03-16)
+[Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.3.0...1.4.0)
+
+### Added
+- *[#15](https://github.com/idealista-tech/solrcloud-role/issues/15) Add jetty-http config file* @javierRobledo
 
 ## [1.3.0](https://github.com/idealista-tech/solrcloud-role/tree/1.3.0) (2017-02-23)
 [Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.2.0...1.3.0)
@@ -13,19 +19,19 @@ All notable changes to this project will be documented in this file.
 [Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.1.1...1.2.0)
 
 ### Added
-- *#8 Set JVM args by configuration* @jmonterrubio
+- *[#8](https://github.com/idealista-tech/solrcloud-role/issues/8) Set JVM args by configuration* @jmonterrubio
 
 ## [1.1.1](https://github.com/idealista-tech/solrcloud-role/tree/1.1.1) (2017-01-11)
 [Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.1.0...1.1.1)
 
 ### Fixed
-- *#4 Copy solr.xml file for not default data dir* @jmonterrubio
+- *[#4](https://github.com/idealista-tech/solrcloud-role/issues/4) Copy solr.xml file for not default data dir* @jmonterrubio
 
 ## [1.1.0](https://github.com/idealista-tech/solrcloud-role/tree/1.1.0)
 [Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.0.1...1.1.0)
 
 ### Added
-- *#1 Enable all the jetty HttpConfiguration parameters from ansible* @jmonterrubio
+- *[#1](https://github.com/idealista-tech/solrcloud-role/issues/1) Enable all the jetty HttpConfiguration parameters from ansible* @jmonterrubio
 
 ### Fixed
 - *Renamed solrcloud-role in tests playbook* @jmonterrubio

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -56,6 +56,9 @@ solr_jetty_send_date_header: #'false'
 solr_jetty_header_cache_size: #512
 solr_jetty_delay_dispatch_until_content: #'false'
 
+solr_jetty_http_selectors: #-1
+solr_jetty_http_acceptors: #-1
+
 zookeeper_hosts: localhost:2181
 zookeeper_hosts_solr_path: solr
 zk_host: "{{ zookeeper_hosts }}/{{ zookeeper_hosts_solr_path }}"

diff --git a/tasks/config.yml b/tasks/config.yml
@@ -20,6 +20,13 @@
       force: yes
   notify: restart SolrCloud
 
+- name: SolrCloud | Configuring jetty server http
+  template:
+      src: jetty-http.xml.j2
+      dest: /opt/solr/server/etc/jetty-http.xml
+      force: yes
+  notify: restart SolrCloud
+
 - name: SolrCloud | Configuring SolrCloud init script
   template:
       src: solr.in.sh.j2

diff --git a/templates/jetty-http.xml.j2 b/templates/jetty-http.xml.j2
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding a HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a HTTP Connector.                                       -->
+  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
+  <!-- HttpConnectionFactory instance using the common httpConfig  -->
+  <!-- instance defined in jetty.xml                               -->
+  <!--                                                             -->
+  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
+  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
+  <!-- that may be set here.                                       -->
+  <!-- =========================================================== -->
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="solr.jetty.http.acceptors" default="-1"/>{{ solr_jetty_http_acceptors }}</Arg>
+        <Arg name="selectors" type="int"><Property name="solr.jetty.http.selectors" default="-1"/>{{ solr_jetty_http_selectors }}</Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.port" default="8983" /></Set>
+        <Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="50000"/></Set>
+        <Set name="soLingerTime"><Property name="solr.jetty.http.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="selectorPriorityDelta"><Property name="solr.jetty.http.selectorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="0"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+</Configure>