Clean up the newly updated iscsi-client script

configs/boot/iscsi-client.rcS:
    Clean up the newly updated iscsi-client script.
    Reduce the writeback period so writes occur more frequently.

--HG--
extra : convert_revision : 21c84f781c6537b28c753291561d23c2d0144627

1 files changed, 17 insertions, 22 deletions

diff --git a/configs/boot/iscsi-client.rcS b/configs/boot/iscsi-client.rcS
index de075e0a0..51ed5a284 100644
--- a/configs/boot/iscsi-client.rcS
+++ b/configs/boot/iscsi-client.rcS
@@ -29,7 +29,7 @@ echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
 echo "131072" > /proc/sys/fs/file-max
-echo "10" > /proc/sys/vm/dirty_writeback_centisecs
+echo "1" > /proc/sys/vm/dirty_writeback_centisecs
 echo "done."
 
 cat > /etc/initiatorname.iscsi <<EOF
@@ -71,37 +71,32 @@ echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
 /sbin/insmod /modules/scsi_transport_iscsi.ko
 /sbin/insmod /modules/iscsi_tcp.ko
 
-# Create /dev/iscsictl
-if [ ! -f /dev/iscsictl ]; then
-    while read major device
-    do
-    if [ "$device" == "iscsictl" ]; then
-        mknod /dev/$device c $major 0
-    fi
-    done < /proc/devices
-fi
-
-echo -n "Starting iscsid..."
+echo "Starting iscsid..."
 /iscsi/iscsid -f &
 
-echo -n "Waiting for server..."
+echo "Waiting for server..."
 /usr/bin/netcat -c -l -p 8000 
 
-echo -n "Attaching target..."
+echo "Attaching target..."
 /iscsi/iscsiadm -m discovery -t st -p 192.168.0.1
 /iscsi/iscsiadm -m node -r a0c049 --login
 echo "done."
 
 sleep 5
 
-echo -n "Starting aio benchmark..."
-/benchmarks/aio_bench/aio-bench -n 8 -s 8 -r .666 -c 8 -i 4000 -C 500 /dev/sda
-# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 5120 -r .666 -c 20 -i 3000 /dev/sda
-# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 8 -r 0 -c 20 -i 3000 /dev/sda
-# stable 960 Mbps /benchmarks/aio_bench/aio-bench -n 8 -s 8 -r 1 -c 20 -i 3000 /dev/sda
-# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 1024 -r 1 -c 20 -i 3000 /dev/sda
-# stable ~1.5 Gbps /benchmarks/aio_bench/aio-bench -n 16 -s 32 -r 1 -c 50 -i 3000 /dev/sda
-# stable ~1.5 Gbps /benchmarks/aio_bench/aio-bench -n 50 -s 32 -r 1 -c 50 -i 3000 /dev/sda
+#PARAMS="-n 8 -s 8 -r .666 -c 50"         # lisa default
+#PARAMS="-n 8 -s 5120 -r .666 -c 20"      # very unstable
+#PARAMS="-n 8 -s 8 -r 0 -c 20"            # very unstable
+#PARAMS="-n 8 -s 8 -r 1 -c 20"            # stable 960 Mbps
+#PARAMS="-n 8 -s 1024 -r 1 -c 20"         # very unstable
+#PARAMS="-n 16 -s 32 -r 1 -c 50"          # stable ~1.5 Gbps
+#PARAMS="-n 50 -s 32 -r 1 -c 50"          # stable ~1.5 Gbps
+PARAMS="-n 50 -s 8 -r .666 -c 50"
+COMMAND="/benchmarks/aio_bench/aio-bench $PARAMS -i 1000000 -C 50000 /dev/sda"
+
+echo "Starting aio benchmark..."
+echo $COMMAND
+eval $COMMAND
 
 echo "starting bash shell..."
 /bin/bash