Merge ~athos-ribeiro/+git/cassandra:initial-review into ~athos-ribeiro/+git/cassandra:master

[Athos Ribeiro]

Addressing Sergio's comments from the mailing list review at https://lists.launchpad.net/ubuntu-docker-images/msg00031.html

The core-20 request was not addressed: we need to use core-18 for the ant plugin.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

It's a bummer that we can't use core20 for this snap. I think it's OK to keep it as core18, but we should keep a TODO to revisit this when possible and investigate what needs to be done to covert to core20.

I'm leaving a question about the $non_proxy_host variable, but otherwise this LGTM.

review: Needs Information

[Athos Ribeiro (athos-ribeiro)]

Hi Sergio,

Thanks for the review.

I make a few additional adjustments to the snap to make sure it runs in strict mode.

[Sergio Durigan Junior (sergiodj)]

Thanks for the follow up. I found a typo in the description, but other than that the changes LGTM now. I confess I didn't try to build the snap locally nor install it in a VM; I will do that now before I approve this MP.

[Athos Ribeiro (athos-ribeiro)]

Thanks!

I fixed the typo and force pushed to fix the bogus commit.

[Sergio Durigan Junior (sergiodj)]

Alright, I built the snap locally and things seemed to work OK. I noticed a few errors during the build, but it finished.

I was also able to install the snap inside a VM and start the service. I noticed that the startup process tries to read /proc/sys/vm/max_map_count but fails because of permission issues; it's worth considering fixing this later, but it's certainly not a blocker.

Another interesting thing is that I noticed the snap doesn't use libjemalloc. I'm not sure if it's possible to include it in the snap, but it's also worth considering.

All in all, this LGTM so I'm approving the MP. Thanks.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks for the review, Sergio.

I will make adjustments to the OCI based on these snap changes. After that, I will re-visit the snap to include cqlsh, verify the /proc/sys/vm/max_map_count issue, and analyze including libjemalloc.

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8b47d02..431f57c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -4,15 +4,13 @@ adopt-info: cassandra
 base: core18
 summary: Manage massive amounts of data, fast, without losing sleep
 description: |
-  The Apache Cassandra database is the right choice when you need
-  scalability and high availability without compromising performance. Linear
-  scalability and proven fault-tolerance on commodity hardware or cloud
-  infrastructure make it the perfect platform for mission-critical
-  data.Cassandra's support for replicating across multiple datacenters is
-  best-in-class, providing lower latency for your users and the peace of
-  mind of knowing that you can survive regional outages.
+  Apache Cassandra is an open source NoSQL distributed database trusted by
+  thousands of companies for scalability and high availability without
+  compromising performance. Linear scalability and proven fault-tolerance on
+  commodity hardware or cloud infrastructure make it a good platform for
+  mission-critical data.
 
-confinement: devmode
+confinement: strict
 grade: devel
 
 apps:
@@ -69,6 +67,8 @@ parts:
                 # remove http(s):// from hosts
                 http_host=$(echo $http_host | sed 's;^https\?://;;')
                 https_host=$(echo $https_host | sed 's;^https\?://;;')
+                non_proxy_hosts=$(echo $no_proxy | sed -e 's;https\?://;;g' -e 's/\s*,\s*/|/g')
+                non_proxy_hosts=${non_proxy_hosts:=localhost}
                 cat << EOF > $HOME/.m2/settings.xml
             <?xml version="1.0" encoding="UTF-8"?>
             <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
@@ -81,6 +81,7 @@ parts:
                   <protocol>http</protocol>
                   <host>${http_host}</host>
                   <port>${http_port}</port>
+                  <nonProxyHosts>${non_proxy_hosts}</nonProxyHosts>
                 </proxy>
                <proxy>
                   <id>launchpad-proxy-https</id>
@@ -88,6 +89,7 @@ parts:
                   <protocol>https</protocol>
                   <host>${https_host}</host>
                   <port>${https_port}</port>
+                  <nonProxyHosts>${non_proxy_hosts}</nonProxyHosts>
                 </proxy>
               </proxies>
             </settings>
@@ -110,6 +112,9 @@ parts:
             fi
             snapcraftctl set-version "${candidate_version}"
             snapcraftctl build
+        override-stage: |
+            snapcraftctl stage
+            chmod +x usr/sbin/cassandra
         build-packages:
             - ant-optional
             - build-essential
diff --git a/wrapper-cassandra b/wrapper-cassandra
index 401a29f..b47a21c 100755
--- a/wrapper-cassandra
+++ b/wrapper-cassandra
@@ -7,7 +7,7 @@
 [ -e "$CASSANDRA_DATA" ] || mkdir "$CASSANDRA_DATA"
 
 # Required config files. Use the default if one is not provided.
-for f in cassandra.yaml logback.xml cassandra-env.sh jvm.options; do
+for f in cassandra.yaml logback.xml cassandra-env.sh jvm8-server.options; do
     if [ ! -e "$CASSANDRA_CONF/$f" ]; then
         if [ "$f" = "cassandra-env.sh" ]; then
             # Libraries are in /usr/share/cassandra, not CASSANDRA_HOME
@@ -20,7 +20,9 @@ for f in cassandra.yaml logback.xml cassandra-env.sh jvm.options; do
 done
 
 export cassandra_storagedir="$CASSANDRA_DATA"
-export JVM_OPTS="$JVM_OPTS -Dcassandra.config=file://$CASSANDRA_CONF/cassandra.yaml"
+export JNA_TMPDIR="$SNAP_DATA/tmp/JNA"
+mkdir -p $JNA_TMPDIR
+export JVM_OPTS="$JVM_OPTS -Dcassandra.config=file://$CASSANDRA_CONF/cassandra.yaml -Djna.tmpdir=$JNA_TMPDIR"
 
 # The -x bit isn't set on cassandra
 /bin/sh $SNAP/usr/sbin/cassandra -R -p "$CASSANDRA_HOME/cassandra.pid"