From 8f5a2deada27bad2fc8b01a81c1a3597a7dead70 Mon Sep 17 00:00:00 2001 From: Juan Valencia Date: Tue, 27 Oct 2015 09:17:28 -0700 Subject: [PATCH] Fixed #16188 --- cluster/aws/templates/format-disks.sh | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cluster/aws/templates/format-disks.sh b/cluster/aws/templates/format-disks.sh index 102e092f674..00e251c5469 100644 --- a/cluster/aws/templates/format-disks.sh +++ b/cluster/aws/templates/format-disks.sh @@ -135,23 +135,15 @@ else move_kubelet="/mnt/ephemeral/kubernetes" else # aufs - # We used to split docker & kubernetes, but we no longer do that, because # host volumes go into the kubernetes area, and it is otherwise very easy # to fill up small volumes. + # + # No need for thin pool since we are not over-provisioning or doing snapshots + # (probably shouldn't be doing snapshots on ephemeral disk? Should be stateless-ish.) + # Tried to do it, but it cause problems (#16188) - release=`lsb_release -c -s` - if [[ "${release}" != "wheezy" ]] ; then - lvcreate -l 100%FREE --thinpool pool-ephemeral vg-ephemeral - - THINPOOL_SIZE=$(lvs vg-ephemeral/pool-ephemeral -o LV_SIZE --noheadings --units M --nosuffix) - lvcreate -V${THINPOOL_SIZE}M -T vg-ephemeral/pool-ephemeral -n ephemeral - else - # Thin provisioning not supported by Wheezy - echo "Detected wheezy; won't use LVM thin provisioning" - lvcreate -l 100%VG -n ephemeral vg-ephemeral - fi - + lvcreate -l 100%VG -n ephemeral vg-ephemeral mkfs -t ext4 /dev/vg-ephemeral/ephemeral mkdir -p /mnt/ephemeral echo "/dev/vg-ephemeral/ephemeral /mnt/ephemeral ext4 noatime 0 0" >> /etc/fstab