Better init scripts for ES 2.0

- Pull latest init scripts for ES 2.0
- Ensure curl is installed, use a curl command to test at the end
- Switch from CONF_FILE to CONF_DIR
- Ensure [:enable, :start] on service resource when testing
- Ensure /etc/sysconfig and /etc/default are used correctly

Author: martinb3

.kitchen.yml

@@ -23,12 +23,15 @@ platforms:
   - name: ubuntu-14.04
     run_list:
     - recipe[apt]
+    - recipe[curl]
   - name: ubuntu-12.04
     run_list:
     - recipe[apt]
+    - recipe[curl]
   - name: centos-6.7
     run_list:
     - recipe[yum]
+    - recipe[curl]
     - recipe[elasticsearch_test::fix_nss] # see recipe header
 
 suites:

Berksfile

@@ -7,4 +7,5 @@ group :integration do
 
   # not a strict dependency, but necessary for TK testing
   cookbook 'java'
+  cookbook 'curl'
 end

libraries/provider_configure.rb

@@ -9,6 +9,7 @@ class ElasticsearchCookbook::ConfigureProvider < Chef::Provider::LWRPBase
       # lookup existing ES resources
       es_user = find_es_resource(run_context, :elasticsearch_user, new_resource)
       es_install = find_es_resource(run_context, :elasticsearch_install, new_resource)
+      es_svc = find_es_resource(run_context, :elasticsearch_service, new_resource)
 
       # if a subdir parameter is missing but dir is set, infer the subdir name
       # then go and be sure it's also set in the YML hash if it wasn't given there
@@ -33,7 +34,7 @@ class ElasticsearchCookbook::ConfigureProvider < Chef::Provider::LWRPBase
 
       # Create ES directories
       #
-      [new_resource.path_conf[es_install.type], new_resource.path_logs[es_install.type]].each do |path|
+      [new_resource.path_conf[es_install.type], "#{new_resource.path_conf[es_install.type]}/scripts", new_resource.path_logs[es_install.type]].each do |path|
         d = directory path do
           owner es_user.username
           group es_user.groupname
@@ -68,14 +69,19 @@ class ElasticsearchCookbook::ConfigureProvider < Chef::Provider::LWRPBase
       # MAX_OPEN_FILES MAX_LOCKED_MEMORY MAX_MAP_COUNT
       params = {}
 
-      params[:JAVA_HOME] = new_resource.java_home
       params[:ES_HOME] = new_resource.path_home[es_install.type]
-      params[:CONF_FILE] = "#{new_resource.path_conf[es_install.type]}/elasticsearch.yml"
+      params[:CONF_DIR] = new_resource.path_conf[es_install.type]
+      params[:DATA_DIR] = new_resource.path_data[es_install.type]
+      params[:LOG_DIR] = new_resource.path_logs[es_install.type]
+      params[:PID_DIR] = new_resource.path_pid[es_install.type]
+
+      params[:ES_USER] = es_user.username
+      params[:ES_GROUP] = es_user.groupname
+
+      params[:JAVA_HOME] = new_resource.java_home
       params[:ES_HEAP_SIZE] = new_resource.allocated_memory
       params[:MAX_OPEN_FILES] = new_resource.nofile_limit
       params[:MAX_LOCKED_MEMORY] = new_resource.memlock_limit
-      params[:ES_USER] = es_user.username
-      params[:ES_GROUP] = es_user.groupname
 
       params[:ES_JAVA_OPTS] = ""
       params[:ES_JAVA_OPTS] << "-server "
@@ -89,8 +95,10 @@ class ElasticsearchCookbook::ConfigureProvider < Chef::Provider::LWRPBase
       params[:ES_JAVA_OPTS] << "-Djna.nosys=true "
       params[:ES_JAVA_OPTS] << "#{new_resource.env_options} " if new_resource.env_options
 
+      default_config_name = es_svc.service_name || es_svc.instance_name || new_resource.instance_name || 'elasticsearch'
+
       shell_template = template 'elasticsearch.in.sh' do
-        path node['platform_family'] == 'rhel' ? '/etc/sysconfig/elasticsearch' : '/etc/default/elasticsearch'
+        path node['platform_family'] == 'rhel' ? "/etc/sysconfig/#{default_config_name}" : "/etc/default/#{default_config_name}"
         source new_resource.template_elasticsearch_env
         cookbook new_resource.cookbook_elasticsearch_env
         mode 0755

libraries/provider_service.rb

@@ -15,6 +15,8 @@ class ElasticsearchCookbook::ServiceProvider < Chef::Provider::LWRPBase
       es_conf = find_es_resource(run_context, :elasticsearch_configure, new_resource)
 
       d_r = directory es_conf.path_pid[es_install.type] do
+        owner es_user.username
+        group es_user.groupname
         mode '0755'
         recursive true
         action :nothing
@@ -31,6 +33,7 @@ class ElasticsearchCookbook::ServiceProvider < Chef::Provider::LWRPBase
         mode 0755
         variables(
           # we need to include something about #{progname} fixed in here.
+          program_name: new_resource.service_name
         )
         action :nothing
       end

templates/centos/initscript.erb

@@ -39,25 +39,31 @@ MAX_OPEN_FILES=65535
 MAX_MAP_COUNT=262144
 LOG_DIR="/var/log/elasticsearch"
 DATA_DIR="/var/lib/elasticsearch"
-WORK_DIR="/tmp/elasticsearch"
 CONF_DIR="/etc/elasticsearch"
-CONF_FILE="/etc/elasticsearch/elasticsearch.yml"
+
 PID_DIR="/var/run/elasticsearch"
 
 # Source the default env file
-ES_ENV_FILE="/etc/sysconfig/elasticsearch"
+ES_ENV_FILE="/etc/sysconfig/<%= @program_name %>"
 if [ -f "$ES_ENV_FILE" ]; then
     . "$ES_ENV_FILE"
 fi
 
+# CONF_FILE setting was removed
+if [ ! -z "$CONF_FILE" ]; then
+    echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
+    exit 1
+fi
+
 exec="$ES_HOME/bin/elasticsearch"
-prog="elasticsearch"
+prog="<%= @program_name %>"
 pidfile="$PID_DIR/${prog}.pid"
 
 export ES_HEAP_SIZE
 export ES_HEAP_NEWSIZE
 export ES_DIRECT_SIZE
 export ES_JAVA_OPTS
+export ES_GC_LOG_FILE
 export JAVA_HOME
 
 lockfile=/var/lock/subsys/$prog
@@ -83,7 +89,6 @@ checkJava() {
 start() {
     checkJava
     [ -x $exec ] || exit 5
-    [ -f $CONF_FILE ] || exit 6
     if [ -n "$MAX_LOCKED_MEMORY" -a -z "$ES_HEAP_SIZE" ]; then
         echo "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
         return 7
@@ -97,10 +102,7 @@ start() {
     if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count ]; then
         sysctl -q -w vm.max_map_count=$MAX_MAP_COUNT
     fi
-    if [ -n "$WORK_DIR" ]; then
-        mkdir -p "$WORK_DIR"
-        chown "$ES_USER":"$ES_GROUP" "$WORK_DIR"
-    fi
+    export ES_GC_LOG_FILE
 
     # Ensure that the PID_DIR exists (it is cleaned at OS startup time)
     if [ -n "$PID_DIR" ] && [ ! -e "$PID_DIR" ]; then
@@ -110,9 +112,10 @@ start() {
         touch "$pidfile" && chown "$ES_USER":"$ES_GROUP" "$pidfile"
     fi
 
+    cd $ES_HOME
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
-    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -d -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR
+    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -d -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.conf=$CONF_DIR
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -122,7 +125,7 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     # stop it here, often "killproc $prog"
-    killproc -p $pidfile -d 20 $prog
+    killproc -p $pidfile -d 86400 $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile