Merge lp:~justin-fathomdb/charms/precise/elasticsearch/update-version into lp:~charmers/charms/precise/elasticsearch/trunk

[justinsb]

Update to elasticsearch 1.1.0

Also replace the Java service wrapper with Upstart.

[Charles Butler (lazypower)]

Justin,

Thank you for this submitted merge proposal.

I like that you're removed the java service wrapper and placed management of the service under upstart. This is a welcome addition plus the latest version upgrade.

The included amulet tests pass, while basic, provided a quick path to validation.

I'm approving this merge. +1 LGTM

Thanks again!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-01-21 15:38:51 +0000
+++ config.yaml	2014-04-14 15:52:45 +0000
@@ -1,7 +1,7 @@
 options:
   version:
     type: string
-    default: "0.90.3"
+    default: "1.1.0"
     description: |
       This sets the elasticsearch version number that will be used.
       If you're  going to plug in logstash,  make sure versions match.
@@ -39,7 +39,7 @@
       This sets the s3 bucket name for the elasticsearch s3 gateway.
   checksum:
     type: string
-    default: "24843192bee3afd19f5a958800e896153dbc3569"
+    default: "6518b6f90df21e034b20e9a222b780651a6cdcdb"
     description: |
       SHA1 checksum of elasticsearch download.
   checksumwrapper:

=== removed file 'files/charm/elasticsearch-0.19.10.tar.gz'
Binary files files/charm/elasticsearch-0.19.10.tar.gz	2012-11-04 04:06:00 +0000 and files/charm/elasticsearch-0.19.10.tar.gz	1970-01-01 00:00:00 +0000 differ
=== removed file 'files/charm/es-wrapper.tar.gz'
Binary files files/charm/es-wrapper.tar.gz	2012-11-04 04:06:00 +0000 and files/charm/es-wrapper.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added directory 'files/charm/services'
=== added file 'files/charm/services/elasticsearch.conf'
--- files/charm/services/elasticsearch.conf	1970-01-01 00:00:00 +0000
+++ files/charm/services/elasticsearch.conf	2014-04-14 15:52:45 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/bash
+
+# elasticsearch instance
+#
+
+description     "elasticsearch instance"
+
+start on virtual-filesystems
+stop on runlevel [06]
+
+respawn
+respawn limit 5 30
+env HOME=/opt/elasticsearch
+
+# Gives "Incompatible minimum and maximum heap sizes specified"
+#env JAVA_OPTS='-Xms512m -Xmx512m'
+
+chdir /opt/elasticsearch
+setuid elasticsearch
+setgid adm
+console log
+
+script
+	/opt/elasticsearch/bin/elasticsearch
+end script
\ No newline at end of file

=== added directory 'files/charm/users'
=== added file 'files/charm/users/elasticsearch'
=== modified file 'hooks/common.sh'
--- hooks/common.sh	2012-11-11 18:34:00 +0000
+++ hooks/common.sh	2014-04-14 15:52:45 +0000
@@ -14,4 +14,5 @@
 ZENMASTERS=$(config-get zenmasters)
 HOST=`unit-get private-address`
 HEAP_SIZE=1024  # may need to change this if using small ec2 instance
-#HEAP_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print int($2*.5/1000)}'`
\ No newline at end of file
+#HEAP_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print int($2*.5/1000)}'`
+USER="elasticsearch"

=== modified file 'hooks/install'
--- hooks/install	2013-09-29 13:21:22 +0000
+++ hooks/install	2014-04-14 15:52:45 +0000
@@ -5,10 +5,14 @@
 HOME=`dirname $0`
 . $HOME/common.sh
 
+juju-log "create elasticsearch user"
+[ -z "$(id ${USER})"] && useradd ${USER}
+
 juju-log "Check if we've installed elasticsearch before"
 
 if [ ! -f "/opt/elasticsearch-$VERSION/bin/elasticsearch" ]; then
 	juju-log "Installing OpenJDK"
+	apt-get update
 	apt-get install -y default-jre-headless wget curl
 
   juju-log "Downloading elasticsearch"
@@ -20,7 +24,7 @@
     install -o root -g root -m 0644 $HOME/../files/charm/elasticsearch-$VERSION.tar.gz /tmp/elasticsearch-$VERSION.tar.gz
   else
     # Download and checksum
-    juju-log "elasticsearch wrapper binary not found local ... download"
+    juju-log "elasticsearch binary not found local ... download"
     wget -q -O /tmp/elasticsearch-$VERSION.tar.gz "${DOWNLOADURL}/elasticsearch-$VERSION.tar.gz"
     if [[ $(sha1sum "/tmp/elasticsearch-$VERSION.tar.gz" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
       juju-log --log-level CRITICAL "Checksum of elasticsearch-$VERSION.tar.gz failed"
@@ -28,42 +32,31 @@
     fi
   fi
 
-	juju-log "Installing service wrapper"
-  if [ -f $HOME/../files/charm/es-wrapper.tar.gz ]
-  then
-    juju-log "elasticsearch wrapper binary found local"
-    install -o root -g root -m 0644 $HOME/../files/charm/es-wrapper.tar.gz /tmp/es-wrapper.tar.gz
-   else
-    # Download and checksum
-    juju-log "elasticsearch wrapper binary not found local ... download"
-    wget  -q -O /tmp/es-wrapper.tar.gz "http://github.com/elasticsearch/elasticsearch-servicewrapper/tarball/master"
-    if [[ $(md5sum "/tmp/es-wrapper.tar.gz" | cut -d " " -f 1) != ${CHECKSUMWRAPPER} ]]; then
-      juju-log --log-level CRITICAL "Checksum of es-wrapper.tar.gz failed"
-      exit 1
-    fi
-  fi
   juju-log "untar elasticsearch"
   cd /opt
   tar xzvf /tmp/elasticsearch-$VERSION.tar.gz
   ln -s elasticsearch-$VERSION elasticsearch
   rm /tmp/elasticsearch-$VERSION.tar.gz
-  juju-log "untar elasticsearch service wrapper"
-  tar xzvf /tmp/es-wrapper.tar.gz
-  rm /tmp/es-wrapper.tar.gz
-  mv *servicewrapper*/service elasticsearch/bin/
-  rm -Rf *servicewrapper*
 
   cd /opt/elasticsearch
 
   juju-log "Setup elasticsearch as a service"
-  /opt/elasticsearch/bin/service/elasticsearch install
+  install -o root -g root -m 0644 ${HOME}/../files/charm/services/elasticsearch.conf /etc/init/elasticsearch.conf
+
+  # Service wrapper stuff
+  #sed -i "s/<Path to ElasticSearch Home>/\/opt\/elasticsearch/" bin/service/elasticsearch.conf
+  #sed -i "s/set\.default\.ES_HEAP_SIZE=.*/set.default.ES_HEAP_SIZE=${HEAP_SIZE}/" bin/service/elasticsearch.conf
+  #sed -i "s/wrapper.app.parameter.1.*/wrapper.app.parameter.1=$BOOTSTRAP_CLASS/" bin/service/elasticsearch.conf
 
   juju-log "Update elasticsearch config"
-  sed -i "s/<Path to ElasticSearch Home>/\/opt\/elasticsearch/" bin/service/elasticsearch.conf
-  sed -i "s/set\.default\.ES_HEAP_SIZE=.*/set.default.ES_HEAP_SIZE=${HEAP_SIZE}/" bin/service/elasticsearch.conf
-  sed -i "s/wrapper.app.parameter.1.*/wrapper.app.parameter.1=$BOOTSTRAP_CLASS/" bin/service/elasticsearch.conf
   sed -i "s/# cluster.name:.*/cluster.name: $CLUSTER_NAME/" config/elasticsearch.yml
 
+  juju-log "Make sure ${USER} user can write"
+  mkdir -p /opt/elasticsearch/logs/
+  chown -R ${USER}. /opt/elasticsearch/logs/
+  mkdir -p /opt/elasticsearch/data/
+  chown -R ${USER}. /opt/elasticsearch/data/
+
   # If Amazon install some magic stuff to allow auto-discovery of other ES nodes.
   if [ ! -z "$ACCESS_KEY" ] && [ ! -z "$SECRET_KEY" ]; then
     juju-log "Install elasticsearch aws plugin"

=== modified file 'hooks/start'
--- hooks/start	2014-01-23 21:09:52 +0000
+++ hooks/start	2014-04-14 15:52:45 +0000
@@ -2,18 +2,23 @@
 # Here put anything that is needed to start the service.
 # Note that currently this is run directly after install
 # i.e. 'service apache2 start'
+
 set -eux # -x for verbose logging to juju debug-log
+
 HOME=`dirname $0`
 . $HOME/common.sh
 
-
 open-port 9200/tcp
 open-port 9300/tcp
-/opt/elasticsearch/bin/service/elasticsearch start
+
+juju-log "run elasticsearch"
+initctl start elasticsearch
+
+juju-log "started"
 
 # load up logstash template. 
 # https://github.com/logstash/logstash/wiki/Elasticsearch-Storage-Optimization
 # really we should do this as part of the relationship join.
-juju-log "sleep 10seconds then install logstash template"
+juju-log "sleep 10 seconds then install logstash template"
 sleep 10s
 curl -XPUT 'http://localhost:9200/_template/template_logstash/' -d @${HOME}/../files/charm/logstash-template.json

=== modified file 'hooks/stop'
--- hooks/stop	2012-11-11 18:34:00 +0000
+++ hooks/stop	2014-04-14 15:52:45 +0000
@@ -9,7 +9,10 @@
 HOME=`dirname $0`
 . $HOME/common.sh
 
-
 #close-port 9200/tcp
 #close-port 9300/tcp
-/opt/elasticsearch/bin/service/elasticsearch stop
+
+if ( initctl status elasticsearch | grep start ); then
+	initctl stop elasticsearch
+fi
+