This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Response to pull request comments

  • Loading branch information...
tomerk committed Jan 27, 2015
1 parent cb29b37 commit d64fc7694eac43e592d495ed891958f636974966
Showing with 2 additions and 14 deletions.
  1. +1 −13 setup-slave.sh
  2. +1 −1 setup.sh
View
@@ -26,7 +26,7 @@ instance_type=$(curl http://169.254.169.254/latest/meta-data/instance-type 2> /d
echo "Setting up slave on `hostname`... of type $instance_type"
if [[ $instance_type == r3* ]]; then
if [[ $instance_type == r3* || $instance_type == i2* ]]; then
# Format & mount using ext4, which has the best performance among ext3, ext4, and xfs based
# on our shuffle heavy benchmark
EXT4_MOUNT_OPTS="defaults,noatime,nodiratime"
@@ -46,18 +46,6 @@ if [[ $instance_type == r3* ]]; then
fi
fi
if [[ $instance_type == i2* ]]; then
# Format & mount using ext4, which has the best performance among ext3, ext4, and xfs based
# on our shuffle heavy benchmark
EXT4_MOUNT_OPTS="defaults,noatime,nodiratime"
rm -rf /mnt*
mkdir /mnt
# To turn TRIM support on, uncomment the following line.
#echo '/dev/sdb /mnt ext4 defaults,noatime,nodiratime,discard 0 0' >> /etc/fstab
mkfs.ext4 -E lazy_itable_init=0,lazy_journal_init=0 /dev/sdb
mount -o $EXT4_MOUNT_OPTS /dev/sdb /mnt
fi
# Mount options to use for ext3 and xfs disks (the ephemeral disks
# are ext3, but we use xfs for EBS volumes to format them faster)
XFS_MOUNT_OPTS="defaults,noatime,nodiratime,allocsize=8m"
View
@@ -70,7 +70,7 @@ pssh --inline \
--host "$MASTERS $SLAVES" \
--user root \
--extra-args "-t -t $SSH_OPTS" \
--timeout 300 \
--timeout 0 \
"spark-ec2/setup-slave.sh"
setup_slave_end_time="$(date +'%s')"
echo_time_diff "setup-slave" "$setup_slave_start_time" "$setup_slave_end_time"

0 comments on commit d64fc76

Please sign in to comment.