From affffdc9ab837ef4acd3c52b2b16872c2198493b Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 12 Feb 2016 11:53:39 -0500
Subject: [PATCH] AWS kube-up: Put the master-pd into /etc/fstab, to mount it
 early

Otherwise we risk services coming up on the master before the backing
volume is ready.

If we then see the master-pd is already mounted, don't try to remount
it.

Issue #21155
---
 cluster/aws/templates/configure-vm-aws.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cluster/aws/templates/configure-vm-aws.sh b/cluster/aws/templates/configure-vm-aws.sh
index 774da61e0c9..da074d918b2 100755
--- a/cluster/aws/templates/configure-vm-aws.sh
+++ b/cluster/aws/templates/configure-vm-aws.sh
@@ -52,6 +52,11 @@ remove-docker-artifacts() {
 
 # Finds the master PD device
 find-master-pd() {
+  if ( grep "/mnt/master-pd" /proc/mounts ); then
+    echo "Master PD already mounted; won't remount"
+    MASTER_PD_DEVICE=""
+    return
+  fi
   echo "Waiting for master pd to be attached"
   attempt=0
   while true; do
@@ -64,6 +69,9 @@ find-master-pd() {
     attempt=$(($attempt+1))
     sleep 1
   done
+
+  # Mount the master PD as early as possible
+  echo "/dev/xvdb /mnt/master-pd ext4 noatime 0 0" >> /etc/fstab
 }
 
 fix-apt-sources() {