From: Michael Vrable <vrable@cs.hmc.edu>
Date: Sun, 22 Jan 2012 03:45:43 +0000 (-0800)
Subject: Merge branch 'master' of git+ssh://niniel.sysnet.ucsd.edu/home/mvrable/local/bluesky
X-Git-Url: http://git.vrable.net/?p=bluesky.git;a=commitdiff_plain;h=edc8e63804c4c1065f3224e829b711c75330072d;hp=0d0d6bc17d11c7258b1d57ce334140493ad4af25

Merge branch 'master' of git+ssh://niniel.sysnet.ucsd.edu/home/mvrable/local/bluesky
---

diff --git a/results/figures/cleaner.gnuplot b/results/figures/cleaner.gnuplot
index b17c91e..bb032bd 100644
--- a/results/figures/cleaner.gnuplot
+++ b/results/figures/cleaner.gnuplot
@@ -2,16 +2,19 @@ load "common.gnuplot"
 
 set grid
 set title "Storage Used: Writes Running Concurrently with Cleaner"
+set xlabel "Cleaner Pass Number"
 set ylabel "Cloud Storage Consumed (MB)"
 set key top right
-set noxtics
 set yrange [0:200]
 
 set output "cleaner.eps"
-plot "../20110925/cleaner.data" using 0:(($1+$2+$5)/1024**2) with boxes fill solid 0.0 lt 1 title "Reclaimed", \
-     "../20110925/cleaner.data" using 0:(($1+$2-$3+$5)/1024**2) with boxes fill solid 0.2 lt 1 title "Wasted", \
-     "../20110925/cleaner.data" using 0:(($1)/1024**2) with boxes fill solid 0.4 lt 1 title "Rewritten", \
-     "../20110925/cleaner.data" using 0:(($1-$5)/1024**2) with boxes fill solid 0.6 lt 1 title "Used/Unaltered"
+set xtics 1
+set xrange [0.5:14.5]
+set grid noxtics
+plot "../20110925/cleaner.data" using ($0+1):(($1+$2+$5)/1024**2) with boxes fill solid 0.0 lt 1 title "Reclaimed", \
+     "../20110925/cleaner.data" using ($0+1):(($1+$2-$3+$5)/1024**2) with boxes fill solid 0.2 lt 1 title "Wasted", \
+     "../20110925/cleaner.data" using ($0+1):(($1)/1024**2) with boxes fill solid 0.4 lt 1 title "Rewritten", \
+     "../20110925/cleaner.data" using ($0+1):(($1-$5)/1024**2) with boxes fill solid 0.6 lt 1 title "Used/Unaltered"
 
 set title "Data Written by Cleaner"
 set ylabel "Writes (MB)"
diff --git a/results/figures/specsfs.gnuplot b/results/figures/specsfs.gnuplot
index 627aac5..07e0ff5 100644
--- a/results/figures/specsfs.gnuplot
+++ b/results/figures/specsfs.gnuplot
@@ -19,7 +19,8 @@ plot "../20110409/sfssum.20110410-native-hi16" with linespoints title "Local NFS
      "../20110409/sfssum.20110409-s3-west-hi16" with linespoints title "BlueSky", \
      "../20110409/sfssum.20110411-s3-west-hi16-crypt" with linespoints title "BlueSky (crypto)", \
      "../20110409/sfssum.20110430-s3-west-hi16-nosegments" with linespoints title "BlueSky (noseg)", \
-     "../20110409/sfssum.20110430-s3-west-hi16-fullfetch" with linespoints title "BlueSky (norange)"
+     "../20110409/sfssum.20110430-s3-west-hi16-fullfetch" with linespoints title "BlueSky (norange)", \
+     "../20120109/sfssum.20120109-s3-west-hi16-lowbandwidth" with linespoints title "BlueSky (100 Mbps)"
      #"../20110409/sfssum.20110430-s3-west-hi16-noreadagg" with linespoints title "BlueSky (noreadagg)"
 
 #set output "spec2a.eps"
@@ -30,7 +31,6 @@ plot "../20110409/sfssum.20110410-native-hi16" with linespoints title "Local NFS
 #     "../20110409/sfssum.20110430-s3-west-hi16-noreadagg" with linespoints title "BlueSky (noreadagg)"
 
 set output "spec1b.eps"
-set key top left
 set ylabel "Operation Latency (ms)"
 set yrange [0:100]
 set key top right
@@ -38,7 +38,8 @@ plot "../20110409/sfssum.20110410-native-hi16" using 1:3 with linespoints title
      "../20110409/sfssum.20110409-s3-west-hi16" using 1:3 with linespoints title "BlueSky", \
      "../20110409/sfssum.20110411-s3-west-hi16-crypt" using 1:3 with linespoints title "BlueSky (crypto)", \
      "../20110409/sfssum.20110430-s3-west-hi16-nosegments" using 1:3 with linespoints title "BlueSky (noseg)", \
-     "../20110409/sfssum.20110430-s3-west-hi16-fullfetch" using 1:3 with linespoints title "BlueSky (norange)"
+     "../20110409/sfssum.20110430-s3-west-hi16-fullfetch" using 1:3 with linespoints title "BlueSky (norange)", \
+     "../20120109/sfssum.20120109-s3-west-hi16-lowbandwidth" using 1:3 with linespoints title "BlueSky (100 Mbps)"
      #"../20110409/sfssum.20110430-s3-west-hi16-noreadagg" using 1:3 with linespoints title "BlueSky (noreadagg)"
 
 # Comparison with low parallelism
diff --git a/traffic-limiter.txt b/traffic-limiter.txt
index 2748375..b78a638 100644
--- a/traffic-limiter.txt
+++ b/traffic-limiter.txt
@@ -1,12 +1,19 @@
-# Limiting traffic rate to 1mbit to Amazon US-West data center (204.246.0.0/16)
+# Limiting outgoing traffic rate to 100 Mbps to Amazon US-West data center
+# (204.246.0.0/16)
 tc qdisc add dev eth0 root handle 1: cbq avpkt 1000 bandwidth 1000mbit
 tc class add dev eth0 parent 1: classid 1:1 cbq rate 100mbit allot 1500 prio 5 bounded isolated
 tc filter add dev eth0 parent 1: protocol ip prio 16 u32 match ip dst 204.246.0.0/16 flowid 1:1
 
+# Limit both incoming traffic as well
+tc qdisc add dev eth0 handle ffff: ingress
+tc filter add dev eth0 parent ffff: protocol ip prio 16 u32 match ip src 204.246.0.0/16 police rate 100mbit burst 10k drop flowid :1
+
 # List traffic classifier state
 tc qdisc show dev eth0
 tc class show dev eth0
 tc filter show dev eth0
+tc filter show dev eth0 parent ffff:
 
 # To clear
 tc qdisc del dev eth0 root
+tc qdisc del dev eth0 ingress