Merge lp:~fginther/charms/trusty/jenkins-remote-slave/cloud-worker-swap-fix into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/cloud-worker

[Francis Ginther]

Add swapfile to /etc/fstab to make it permanent.

Add swapfile to /etc/fstab to make it permanent.

[Joe Talbott (joetalbott)]

Typo

review: Needs Fixing

[lp:~fginther/charms/trusty/jenkins-remote-slave/cloud-worker-swap-fix]

36. By Francis Ginther on 2015-10-06

Fix typo in SWAPFILE.

[Francis Ginther (fginther)]

Joe, Thanks for catching that typo. I tested the changes by copy-n-pasting just the new bits to a test file and missed the edit for SWAPFILE. I've retested this snippet after fixing the typo.

[Joe Talbott (joetalbott)]

LGTM, thanks.

review: Approve

[Para Siva (psivaa)]

Thanks a lot Francis for working on this.

I'm not sure if a charm upgrade with this change will fix currently deployed slaves. This is because the code execution would not reach the code where you edit /etc/fstab. Since there is already a swapfile at /.

New charm deployments will be certainly free of this bug.

I'm marking this as 'Needs fixing' but feel free to ignore, since this fix may not be intended to be applied to all the slaves deployed everywhere.

review: Needs Fixing

[lp:~fginther/charms/trusty/jenkins-remote-slave/cloud-worker-swap-fix]

37. By Francis Ginther on 2015-10-07

Refactor 0200-swap.sh to continue to update fstab file if the swapfile already exists.

[Francis Ginther (fginther)]

Siva, thanks for catching that. I've refactored the script to continue if the swapfile is defined and still only create it if it's not there. I've tested this locally from a fresh deployment and an upgrade from a deployment made prior to this change.

[Para Siva (psivaa)]

Thanks for addressing the comment. Looks perfect. Thanks again for fixing this issue.

review: Approve

=== modified file 'hooks/install.d/0200-swap.sh'
--- hooks/install.d/0200-swap.sh	2015-07-23 16:06:44 +0000
+++ hooks/install.d/0200-swap.sh	2015-10-07 13:14:22 +0000
@@ -1,16 +1,19 @@
 #!/bin/bash
-set -ex
+set -eux
 
 SWAPFILE=/swapfile
 SWAP_SIZE=4G
 
-if [ -f "${SWAPFILE}" ]; then
-    exit 0
-fi
-
-echo "Creating swapfile ${SWAPFILE} of ${SWAP_SIZE}"
-
-fallocate -l "${SWAP_SIZE}" "${SWAPFILE}"
-chmod 600 "${SWAPFILE}"
-mkswap "${SWAPFILE}"
-swapon "${SWAPFILE}"
+if [ ! -f "${SWAPFILE}" ]; then
+    echo "Creating swapfile ${SWAPFILE} of ${SWAP_SIZE}"
+    
+    fallocate -l "${SWAP_SIZE}" "${SWAPFILE}"
+    chmod 600 "${SWAPFILE}"
+    mkswap "${SWAPFILE}"
+    swapon "${SWAPFILE}"
+fi
+
+# Make the new swap permanent by adding it to /etc/fstab
+if ! grep -q ${SWAPFILE} /etc/fstab; then
+    echo "${SWAPFILE}   none    swap    sw    0   0" >> /etc/fstab
+fi