Configure culling before enabling cachefilesd

The nocull option needs to be set before the cachefilesd service is
enabled. Move the configure-culling step to before creating the cache.

Defer starting the custom culling service until after cachefilesd has
been started to ensure the cache's directory structure has been created.

Change-Id: Ib06dfa81dbaf282381e41c748e371e3ce3b957fa

Author: chris-chilvers-qodea

deployment/terraform-module-knfsd/resources/proxy-startup.sh

@@ -278,7 +278,7 @@ function create-fs-cache() {
 		else
 			echo "Persistent Disk is already formatted."
 		fi
-		
+
 		echo "Mounting /dev/disk/by-id/google-pd-fscache to FS-Cache directory (/var/cache/fscache)..."
 		mount -o discard,defaults /dev/disk/by-id/google-pd-fscache /var/cache/fscache
 		echo "Finished mounting /dev/disk/by-id/google-pd-fscache to FS-Cache directory (/var/cache/fscache)"
@@ -352,7 +352,7 @@ function start-fs-cache() {
 
 	MOUNT_OPTIONS="${MOUNT_OPTIONS},fsc"
 	echo "FS-Cache started."
-	
+
 }
 
 function export-map() {
@@ -453,23 +453,16 @@ function configure-culling() (
 	}
 
 	sed -i '/^nocull/d' /etc/cachefilesd.conf
-
 	if [[ "$CULLING" == "none" ]] || [[ "$CULLING" == "custom" ]]; then
 		echo "nocull" >>/etc/cachefilesd.conf
 	fi
 
+	: >/etc/knfsd-cull.conf
 	if [[ "$CULLING" == "custom" ]]; then
-		: >/etc/knfsd-cull.conf
 		fmt last-access "$CULLING_LAST_ACCESS" >>/etc/knfsd-cull.conf
 		fmt threshold "$CULLING_THRESHOLD" >>/etc/knfsd-cull.conf
 		fmt interval "$CULLING_INTERVAL" >>/etc/knfsd-cull.conf
 		fmt quiet-period "$CULLING_QUIET_PERIOD" >>/etc/knfsd-cull.conf
-
-		echo "Starting Custom Culling Agent..."
-		start-services knfsd-cull
-		echo "Finished starting Custom Culling Agent."
-	else
-		echo "Custom Culling Agent disabled. Skipping..."
 	fi
 )
 
@@ -509,6 +502,14 @@ function start-nfs() {
 		echo "Knfsd Agent disabled. Skipping..."
 	fi
 
+	if [[ "$CULLING" == "custom" ]]; then
+		echo "Starting Custom Culling Agent..."
+		start-services knfsd-cull
+		echo "Finished starting Custom Culling Agent."
+	else
+		echo "Custom Culling Agent disabled. Skipping..."
+	fi
+
 	# Start NFS Server
 	echo "Starting nfs-kernel-server..."
 	start-services portmap nfs-kernel-server
@@ -541,6 +542,9 @@ function cleanup() {
 
 function main() {
 	init
+
+	# culling needs to be configured before cachefilesd is started
+	configure-culling
 	create-fs-cache
 
 	echo "Mount options : ${MOUNT_OPTIONS}"
@@ -552,7 +556,6 @@ function main() {
 
 	configure-read-ahead
 	configure-nfs
-	configure-culling
 	configure-metrics
 
 	start-nfs

deployment/terraform-module-knfsd/resources/tests/configure-culling.bats

@@ -45,9 +45,6 @@ function assert_nocull() {
 	run configure-culling
 	assert_success
 	assert_nocull
-
-	# check no services were started
-	assert_equal "$(cat /tmp/systemctl)" ""
 }
 
 @test "culling custom sets nocull" {
@@ -57,9 +54,6 @@ function assert_nocull() {
 	assert_success
 	assert_nocull
 
-	# check custom culling agent started
-	assert_equal "$(cat /tmp/systemctl)" "start knfsd-cull"
-
 	# run a second time to check it doesn't add a duplicate nocull
 	run configure-culling
 	assert_success

deployment/terraform-module-knfsd/resources/tests/start-nfs.bats

@@ -0,0 +1,36 @@
+function setup() {
+	source /opt/bats/lib/bats-support/load.bash
+	source /opt/bats/lib/bats-assert/load.bash
+	load ./common.bash
+	load ../proxy-startup.sh
+
+	cp "$BATS_TEST_DIRNAME"/cachefilesd.conf.example /etc/cachefilesd.conf
+}
+
+@test start_basic {
+	run start-nfs
+	assert_success
+	assert_equal "$(cat /tmp/systemctl)" "start portmap nfs-kernel-server"
+}
+
+@test start_with_agent {
+	ENABLE_KNFSD_AGENT=true
+	run start-nfs
+	assert_success
+	assert_equal "$(cat /tmp/systemctl)" "$(cat <<-EOT
+		start knfsd-agent
+		start portmap nfs-kernel-server
+	EOT
+	)"
+}
+
+@test start_with_custom_culling {
+	CULLING=custom
+	run start-nfs
+	assert_success
+	assert_equal "$(cat /tmp/systemctl)" "$(cat <<-EOT
+		start knfsd-cull
+		start portmap nfs-kernel-server
+	EOT
+	)"
+}