From 43ef004de30d6d578d34a9241ec76f5853fcb191 Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Sat, 16 Jan 2010 09:05:34 +0000
Subject: [PATCH] HBASE-2131 [EC2] Mount data volumes as xfs, noatime

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@899908 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                         |  1 +
 src/contrib/ec2/bin/hbase-ec2-init-remote.sh        | 10 ++++++++--
 src/contrib/ec2/bin/image/create-hbase-image-remote |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 46c351a85d2..52ca9d94513 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -318,6 +318,7 @@ Release 0.21.0 - Unreleased
    HBASE-2084  [EC2] JAVA_HOME handling broken
    HBASE-2100  [EC2] Adjust fs.file-max
    HBASE-2103  [EC2] pull version from build
+   HBASE-2131  [EC2] Mount data volumes as xfs, noatime
    HBASE-1901  "General" partitioner for "hbase-48" bulk (behind the api, write
                hfiles direct) uploader
    HBASE-1433  Update hbase build to match core, use ivy, publish jars to maven
diff --git a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
index 04e36a8864e..92170e3ea5d 100644
--- a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
+++ b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
@@ -62,7 +62,12 @@ else
   service gmond start
 fi
 
-# Probe for instance volumes
+# Reformat sdb as xfs
+umount /mnt
+mkfs.xfs -f /dev/sdb
+mount -o noatime /dev/sdb /mnt
+
+# Probe for additional instance volumes
 
 # /dev/sdb as /mnt is always set up by base image
 DFS_NAME_DIR="/mnt/hadoop/dfs/name"
@@ -71,8 +76,9 @@ i=2
 for d in c d e f g h i j k l m n o p q r s t u v w x y z; do
   m="/mnt${i}"
   mkdir -p $m
-  mount /dev/sd${d} $m > /dev/null 2>&1
+  mkfs.xfs -f /dev/sd${d}
   if [ $? -eq 0 ] ; then
+    mount -o noatime /dev/sd${d} $m > /dev/null 2>&1
     if [ $i -lt 3 ] ; then # no more than two namedirs
       DFS_NAME_DIR="${DFS_NAME_DIR},${m}/hadoop/dfs/name"
     fi
diff --git a/src/contrib/ec2/bin/image/create-hbase-image-remote b/src/contrib/ec2/bin/image/create-hbase-image-remote
index 47e8c161754..fe8786dbcff 100755
--- a/src/contrib/ec2/bin/image/create-hbase-image-remote
+++ b/src/contrib/ec2/bin/image/create-hbase-image-remote
@@ -44,7 +44,7 @@ rm -f java.bin
 # Install tools
 echo "Installing rpms."
 yum -y update
-yum -y install rsync lynx screen ganglia-gmetad ganglia-gmond ganglia-web httpd php lzo-devel
+yum -y install rsync lynx screen ganglia-gmetad ganglia-gmond ganglia-web httpd php lzo-devel xfsprogs
 yum -y clean all
 
 # Install Hadoop