Regression test portability: dd usage

NetBSD, FreeBSD, and MacOS X dd(1) bs argument uses m for megabyte, while
Linux uses M. Use bs=1024k instead of bs=1M for better compatibility.

BUG: 764655
Change-Id: I603f57adbc9b31f6d634b918726437fbfce42e03
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8278
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Justin Clift <justin@gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

24 files changed, 56 insertions, 56 deletions

diff --git a/tests/basic/afr/read-subvol-data.t b/tests/basic/afr/read-subvol-data.t
index 2fa20a2c181..0c4b366331d 100644
--- a/tests/basic/afr/read-subvol-data.t
+++ b/tests/basic/afr/read-subvol-data.t
@@ -20,9 +20,9 @@ TEST $CLI volume set $V0 cluster.read-subvolume $V0-client-1
 TEST $CLI volume set $V0 cluster.data-self-heal off
 TEST $CLI volume set $V0 cluster.metadata-self-heal off
 TEST $CLI volume set $V0 cluster.entry-self-heal off
-TEST dd if=/dev/urandom of=$M0/afr_success_5.txt bs=1M count=1
+TEST dd if=/dev/urandom of=$M0/afr_success_5.txt bs=1024k count=1
 TEST kill_brick $V0 $H0 $B0/brick0
-TEST dd if=/dev/urandom of=$M0/afr_success_5.txt bs=1M count=10
+TEST dd if=/dev/urandom of=$M0/afr_success_5.txt bs=1024k count=10
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "10485760" echo `ls -l $M0/afr_success_5.txt | awk '{ print $5}'`
 
diff --git a/tests/basic/afr/self-heal.t b/tests/basic/afr/self-heal.t
index 575ed4c4f72..60e953b9996 100644
--- a/tests/basic/afr/self-heal.t
+++ b/tests/basic/afr/self-heal.t
@@ -21,10 +21,10 @@ TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --att
 
 #Test
 TEST mkdir -p $M0/abc/def $M0/abc/ghi
-TEST dd if=/dev/urandom of=$M0/abc/file_abc.txt bs=1M count=2 2>/dev/null
-TEST dd if=/dev/urandom of=$M0/abc/def/file_abc_def_1.txt bs=1M count=2 2>/dev/null
-TEST dd if=/dev/urandom of=$M0/abc/def/file_abc_def_2.txt bs=1M count=3 2>/dev/null
-TEST dd if=/dev/urandom of=$M0/abc/ghi/file_abc_ghi.txt bs=1M count=4 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/abc/file_abc.txt bs=1024k count=2 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/abc/def/file_abc_def_1.txt bs=1024k count=2 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/abc/def/file_abc_def_2.txt bs=1024k count=3 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/abc/ghi/file_abc_ghi.txt bs=1024k count=4 2>/dev/null
 
 TEST kill_brick $V0 $H0 $B0/brick0
 TEST truncate -s 0 $M0/abc/def/file_abc_def_1.txt
@@ -33,9 +33,9 @@ NEW_GID=36
 TEST chown  $NEW_UID:$NEW_GID $M0/abc/def/file_abc_def_2.txt
 TEST rm -rf $M0/abc/ghi
 TEST mkdir -p $M0/def/ghi $M0/jkl/mno
-TEST dd if=/dev/urandom of=$M0/def/ghi/file1.txt bs=1M count=2 2>/dev/null
-TEST dd if=/dev/urandom of=$M0/def/ghi/file2.txt bs=1M count=3 2>/dev/null
-TEST dd if=/dev/urandom of=$M0/jkl/mno/file.txt bs=1M count=4 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/def/ghi/file1.txt bs=1024k count=2 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/def/ghi/file2.txt bs=1024k count=3 2>/dev/null
+TEST dd if=/dev/urandom of=$M0/jkl/mno/file.txt bs=1024k count=4 2>/dev/null
 TEST chown  $NEW_UID:$NEW_GID $M0/def/ghi/file2.txt
 
 TEST $CLI volume start $V0 force
diff --git a/tests/basic/afr/sparse-file-self-heal.t b/tests/basic/afr/sparse-file-self-heal.t
index 01b676ea900..fa8375b1c8d 100644
--- a/tests/basic/afr/sparse-file-self-heal.t
+++ b/tests/basic/afr/sparse-file-self-heal.t
@@ -14,9 +14,9 @@ TEST $CLI volume set $V0 data-self-heal-algorithm full
 TEST $CLI volume start $V0
 
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST dd if=/dev/urandom of=$M0/small count=1 bs=1M
-TEST dd if=/dev/urandom of=$M0/bigger2big count=1 bs=2M
-TEST dd if=/dev/urandom of=$M0/big2bigger count=1 bs=1M
+TEST dd if=/dev/urandom of=$M0/small count=1 bs=1024k
+TEST dd if=/dev/urandom of=$M0/bigger2big count=1 bs=2048k
+TEST dd if=/dev/urandom of=$M0/big2bigger count=1 bs=1024k
 
 TEST kill_brick $V0 $H0 $B0/${V0}0
 
@@ -71,9 +71,9 @@ TEST rm -f $M0/*
 #check the same tests with diff self-heal
 TEST $CLI volume set $V0 data-self-heal-algorithm diff
 
-TEST dd if=/dev/urandom of=$M0/small count=1 bs=1M
-TEST dd if=/dev/urandom of=$M0/big2bigger count=1 bs=1M
-TEST dd if=/dev/urandom of=$M0/bigger2big count=1 bs=2M
+TEST dd if=/dev/urandom of=$M0/small count=1 bs=1024k
+TEST dd if=/dev/urandom of=$M0/big2bigger count=1 bs=1024k
+TEST dd if=/dev/urandom of=$M0/bigger2big count=1 bs=2048k
 
 TEST kill_brick $V0 $H0 $B0/${V0}0
 
diff --git a/tests/basic/cdc.t b/tests/basic/cdc.t
index f7c117063f8..be7d9a4ad0b 100755
--- a/tests/basic/cdc.t
+++ b/tests/basic/cdc.t
@@ -51,11 +51,11 @@ TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $
 ####################
 
 ## Create a 1K file locally and find the md5sum
-TEST dd if=/dev/zero of=/tmp/cdc-orig count=1 bs=1K 2>/dev/null
+TEST dd if=/dev/zero of=/tmp/cdc-orig count=1 bs=1k 2>/dev/null
 checksum[original-file]=`md5sum /tmp/cdc-orig | cut -d' ' -f1`
 
 ## Copy the file to mountpoint and find its md5sum on brick
-TEST dd if=/tmp/cdc-orig of=$M0/cdc-server count=1 bs=1K 2>/dev/null
+TEST dd if=/tmp/cdc-orig of=$M0/cdc-server count=1 bs=1k 2>/dev/null
 checksum[brick-file]=`md5sum $B0/${V0}1/cdc-server | cut -d' ' -f1`
 
 ## Uncompress the gzip dump file and find its md5sum
@@ -75,7 +75,7 @@ TEST rm -f /tmp/cdcdump.gz
 ###################
 
 ## Copy file from mount point to client and find checksum
-TEST dd if=$M0/cdc-server of=/tmp/cdc-client count=1 bs=1K 2>/dev/null
+TEST dd if=$M0/cdc-server of=/tmp/cdc-client count=1 bs=1k 2>/dev/null
 checksum[client-file]=`md5sum /tmp/cdc-client | cut -d' ' -f1`
 
 ## Uncompress the gzip dump file and find its md5sum
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index 1f6febd73a5..ae45a6357cd 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -70,19 +70,19 @@ TEST $CLI volume quota $V0 hard-timeout 0
 ## Verify quota enforcement
 ## -----------------------------
 
-TEST ! dd if=/dev/urandom of=$M0/test_dir/1.txt bs=1M count=12
+TEST ! dd if=/dev/urandom of=$M0/test_dir/1.txt bs=1024k count=12
 TEST rm $M0/test_dir/1.txt
 
 # wait for marker's accounting to complete
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir"
 
-TEST dd if=/dev/urandom of=$M0/test_dir/2.txt bs=1M count=8
+TEST dd if=/dev/urandom of=$M0/test_dir/2.txt bs=1024k count=8
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir"
 TEST rm $M0/test_dir/2.txt
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir"
 
 ## rename tests
-TEST dd if=/dev/urandom of=$M0/test_dir/2 bs=1M count=8
+TEST dd if=/dev/urandom of=$M0/test_dir/2 bs=1024k count=8
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir"
 TEST mv $M0/test_dir/2 $M0/test_dir/0
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir"
@@ -137,7 +137,7 @@ done
 #53-62
 for i in `seq 1 9`; do
         TEST_IN_LOOP dd if=/dev/urandom of="$M0/$TESTDIR/dir1/10MBfile$i" \
-                        bs=1M count=10;
+                        bs=1024k count=10;
 done
 
 # 63-64
@@ -159,7 +159,7 @@ done
 ## <Try creating data beyond limit>
 ## --------------------------------
 for i in `seq 1 200`; do
-        dd if=/dev/urandom of="$M0/$TESTDIR/dir1/1MBfile$i" bs=1M count=1 \
+        dd if=/dev/urandom of="$M0/$TESTDIR/dir1/1MBfile$i" bs=1024k count=1 \
            &>/dev/null
 done
 
diff --git a/tests/basic/self-heald.t b/tests/basic/self-heald.t
index 913cfc80599..b5815a6773f 100644
--- a/tests/basic/self-heald.t
+++ b/tests/basic/self-heald.t
@@ -19,7 +19,7 @@ cd $M0
 HEAL_FILES=0
 for i in {1..10}
 do
-        dd if=/dev/urandom of=f bs=1M count=10 2>/dev/null
+        dd if=/dev/urandom of=f bs=1024k count=10 2>/dev/null
         HEAL_FILES=$(($HEAL_FILES+1))
         mkdir a; cd a;
         HEAL_FILES=$(($HEAL_FILES+3)) #As many times as distribute subvols
diff --git a/tests/bugs/859927/repl.t b/tests/bugs/859927/repl.t
index 9ac524fc1bd..0094f43dfca 100755
--- a/tests/bugs/859927/repl.t
+++ b/tests/bugs/859927/repl.t
@@ -11,7 +11,7 @@ TEST pidof glusterd
 function create_setup_for_self_heal {
         file=$1
         kill_brick $V0 $H0 $B0/${V0}1
-        dd of=$file if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
+        dd of=$file if=/dev/urandom bs=1024k count=1 2>&1 > /dev/null
         $CLI volume start $V0 force
 }
 
diff --git a/tests/bugs/bug-1023974.t b/tests/bugs/bug-1023974.t
index 06d33c12f7f..1920a6716cf 100644
--- a/tests/bugs/bug-1023974.t
+++ b/tests/bugs/bug-1023974.t
@@ -25,9 +25,9 @@ TEST $CLI volume quota $V0 hard-timeout 0
 TEST $CLI volume quota $V0 soft-timeout 0
 
 #The corresponding write(3) should fail with EDQUOT ("Disk quota exceeded")
-TEST ! dd if=/dev/urandom of=$M0/1/2/file bs=1M count=102;
+TEST ! dd if=/dev/urandom of=$M0/1/2/file bs=1024k count=102;
 TEST mkdir $M0/1/3 -p;
-TEST dd if=/dev/urandom of=$M0/1/3/file bs=1M count=102;
+TEST dd if=/dev/urandom of=$M0/1/3/file bs=1024k count=102;
 
 #The corresponding rename(3) should fail with EDQUOT ("Disk quota exceeded")
 TEST ! mv $M0/1/3/ $M0/1/2/3_mvd;
diff --git a/tests/bugs/bug-1030580.t b/tests/bugs/bug-1030580.t
index 642c6dc4460..1b03ae2f0cd 100644
--- a/tests/bugs/bug-1030580.t
+++ b/tests/bugs/bug-1030580.t
@@ -6,7 +6,7 @@
 cleanup;
 
 function write_to_file {
-    dd of=$M0/1 if=/dev/zero bs=1M count=128 oflag=append 2>&1 >/dev/null
+    dd of=$M0/1 if=/dev/zero bs=1024k count=128 oflag=append 2>&1 >/dev/null
 }
 
 TEST glusterd
diff --git a/tests/bugs/bug-1038598.t b/tests/bugs/bug-1038598.t
index d4b0b3e63ae..4846b7dc78a 100644
--- a/tests/bugs/bug-1038598.t
+++ b/tests/bugs/bug-1038598.t
@@ -59,12 +59,12 @@ TEST $CLI volume quota $V0 limit-usage /test_dir 10MB 50
 EXPECT "10.0MB" hard_limit "/test_dir";
 EXPECT "50%" soft_limit "/test_dir";
 
-TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1M count=4
+TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=4
 EXPECT "4.0MB" usage "/test_dir";
 EXPECT 'No' sl_exceeded "/test_dir";
 EXPECT 'No' hl_exceeded "/test_dir";
 
-TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1M count=6
+TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=6
 EXPECT "6.0MB" usage "/test_dir";
 EXPECT 'Yes' sl_exceeded "/test_dir";
 EXPECT 'No' hl_exceeded "/test_dir";
@@ -73,7 +73,7 @@ EXPECT 'No' hl_exceeded "/test_dir";
 TEST $CLI volume set $V0 features.hard-timeout 0
 TEST $CLI volume set $V0 features.soft-timeout 0
 
-TEST ! dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1M count=15
+TEST ! dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=15
 EXPECT 'Yes' sl_exceeded "/test_dir";
 EXPECT 'Yes' hl_exceeded "/test_dir";
 
diff --git a/tests/bugs/bug-1047416.t b/tests/bugs/bug-1047416.t
index 53c7f861462..67a0fea5259 100644
--- a/tests/bugs/bug-1047416.t
+++ b/tests/bugs/bug-1047416.t
@@ -6,7 +6,7 @@
 cleanup;
 
 function write_to_file {
-    dd of=$M0/1 if=/dev/zero bs=1M count=128 oflag=append 2>&1 >/dev/null
+    dd of=$M0/1 if=/dev/zero bs=1024k count=128 oflag=append 2>&1 >/dev/null
 }
 
 TEST glusterd
diff --git a/tests/bugs/bug-1087198.t b/tests/bugs/bug-1087198.t
index e34334b61f5..92d2acc0859 100644
--- a/tests/bugs/bug-1087198.t
+++ b/tests/bugs/bug-1087198.t
@@ -52,10 +52,10 @@ TEST $CLI volume quota $V0 limit-usage /$QUOTA_LIMIT_DIR 100KB
 
 #16
 ## Step 3 and 4
-TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/95KB_file bs=1K count=95
+TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/95KB_file bs=1k count=95
 TEST grep -e "\"Usage crossed soft limit:.*used by /$QUOTA_LIMIT_DIR\"" -- $BRICK_LOG_DIR/*
 
-TEST dd if=/dev/urandom of=$N0/100KB_file bs=1K count=100
+TEST dd if=/dev/urandom of=$N0/100KB_file bs=1k count=100
 TEST grep -e "\"Usage crossed soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 
 #20
@@ -63,11 +63,11 @@ TEST grep -e "\"Usage crossed soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 TEST sleep 10
 
 ## Step 6
-TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/1KB_file bs=1K count=1
+TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/1KB_file bs=1k count=1
 TEST grep -e "\"Usage is above soft limit:.*used by /$QUOTA_LIMIT_DIR\"" -- $BRICK_LOG_DIR/*
 
 #23
-TEST dd if=/dev/urandom of=$N0/1KB_file bs=1K count=1
+TEST dd if=/dev/urandom of=$N0/1KB_file bs=1k count=1
 TEST grep -e "\"Usage is above soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 
 #25
diff --git a/tests/bugs/bug-1099890.t b/tests/bugs/bug-1099890.t
index 1c07b62c02f..a27d4e74fbf 100644
--- a/tests/bugs/bug-1099890.t
+++ b/tests/bugs/bug-1099890.t
@@ -49,14 +49,14 @@ EXPECT "150M" echo `df -h $M0 -P | tail -1 | awk {'print $2'}`
 
 # Create a new file 'foo' under the root of the volume, which hashes to subvol-0
 # of DHT, that consumes 40M
-TEST   dd if=/dev/zero of=$M0/foo bs=5M count=8
+TEST   dd if=/dev/zero of=$M0/foo bs=5120k count=8
 
 TEST   stat $B0/${V0}1/foo
 TEST ! stat $B0/${V0}2/foo
 
 # Create a new file 'bar' under the root of the volume, which hashes to subvol-1
 # of DHT, that consumes 40M
-TEST   dd if=/dev/zero of=$M0/bar bs=5M count=8
+TEST   dd if=/dev/zero of=$M0/bar bs=5120k count=8
 
 TEST ! stat $B0/${V0}1/bar
 TEST   stat $B0/${V0}2/bar
@@ -84,7 +84,7 @@ TEST   touch $M0/empty1;
 # If this bug is fixed, then DHT should be routing the creation to subvol-1 only
 # as it has more than min-free-disk space available.
 
-TEST   dd if=/dev/zero of=$M0/file bs=1K count=1
+TEST   dd if=/dev/zero of=$M0/file bs=1k count=1
 sleep 1;
 TEST ! stat $B0/${V0}1/file
 TEST   stat $B0/${V0}2/file
@@ -96,7 +96,7 @@ TEST touch $M0/empty2;
 
 # Now I create a new file that hashes to subvol-0, at the end of which, there
 # will be less than min-free-disk space available on it.
-TEST   dd if=/dev/zero of=$M0/fil bs=5M count=4
+TEST   dd if=/dev/zero of=$M0/fil bs=5120k count=4
 sleep 1;
 TEST   stat $B0/${V0}1/fil
 TEST ! stat $B0/${V0}2/fil
@@ -108,7 +108,7 @@ TEST   touch $M0/empty3;
 # Now I create a file that hashes to subvol-0 but since it has less than
 # min-free-disk space available, its data will be cached on subvol-1.
 
-TEST   dd if=/dev/zero of=$M0/zz bs=5M count=1
+TEST   dd if=/dev/zero of=$M0/zz bs=5120k count=1
 
 TEST   stat $B0/${V0}1/zz
 TEST   stat $B0/${V0}2/zz
diff --git a/tests/bugs/bug-844688.t b/tests/bugs/bug-844688.t
index ea9efe91d8e..228a3ed2470 100755
--- a/tests/bugs/bug-844688.t
+++ b/tests/bugs/bug-844688.t
@@ -16,7 +16,7 @@ mount_pid=$(get_mount_process_pid $V0);
 kill -USR2 $mount_pid;
 
 TEST touch $M0/touchfile;
-(dd if=/dev/urandom of=$M0/file bs=5K 2>/dev/null 1>/dev/null)&
+(dd if=/dev/urandom of=$M0/file bs=5k 2>/dev/null 1>/dev/null)&
 back_pid=$!;
 statedump_file=$(generate_mount_statedump $V0);
 grep "callstack-creation-time" $statedump_file 2>/dev/null 1>/dev/null;
diff --git a/tests/bugs/bug-861015-log.t b/tests/bugs/bug-861015-log.t
index 032032470fd..c403f552949 100644
--- a/tests/bugs/bug-861015-log.t
+++ b/tests/bugs/bug-861015-log.t
@@ -16,7 +16,7 @@ TEST kill_brick $V0 $H0 $B0/${V0}0
 cd $M0
 for i in {1..10}
 do
-        dd if=/dev/urandom of=f bs=1M count=10 2>/dev/null
+        dd if=/dev/urandom of=f bs=1024k count=10 2>/dev/null
 done
 
 cd ~
diff --git a/tests/bugs/bug-866459.t b/tests/bugs/bug-866459.t
index 94ef2695062..fe92f3a4ec5 100644
--- a/tests/bugs/bug-866459.t
+++ b/tests/bugs/bug-866459.t
@@ -21,13 +21,13 @@ TEST $CLI volume start $V0
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
-dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
+dd of=$M0/a if=/dev/urandom bs=1024k count=1 2>&1 > /dev/null
 B0_hiphenated=`echo $B0 | tr '/' '-'`
 ## Bring a brick down
 TEST kill_brick $V0 $H0 $B0/${V0}1
 EXPECT '1' echo `pgrep glusterfsd | wc -l`
 ## Rewrite the file
-dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
+dd of=$M0/a if=/dev/urandom bs=1024k count=1 2>&1 > /dev/null
 TEST $CLI volume start $V0 force
 ## Wait for the brick to give CHILD_UP in client protocol
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0
diff --git a/tests/bugs/bug-873962.t b/tests/bugs/bug-873962.t
index 80652f38abe..bd3132ce7f0 100755
--- a/tests/bugs/bug-873962.t
+++ b/tests/bugs/bug-873962.t
@@ -76,7 +76,7 @@ TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0
 EXPECT "2" cat $M0/a;
 # FAIL HERE - see comment about cluster.self-heal-background-count above.
 EXPECT "2" cat $M1/a;
-TEST dd if=$M0/b of=/dev/null bs=1M
+TEST dd if=$M0/b of=/dev/null bs=1024k
 EXPECT "def" getfattr -n trusted.mdata --only-values $M0/b 2>/dev/null
 EXPECT "def" getfattr -n trusted.mdata --only-values $M1/b 2>/dev/null
 
diff --git a/tests/bugs/bug-888174.t b/tests/bugs/bug-888174.t
index ef653f76da2..d45124d0dee 100644
--- a/tests/bugs/bug-888174.t
+++ b/tests/bugs/bug-888174.t
@@ -36,13 +36,13 @@ inodelk_max_latency=$($CLI volume profile $V0 info | grep INODELK | awk 'BEGIN {
 
 TEST [ -z $inodelk_max_latency ]
 
-TEST dd of=$M0/a if=/dev/urandom bs=1M count=10 conv=fsync
+TEST dd of=$M0/a if=/dev/urandom bs=1024k count=10 conv=fsync
 #Check for no trace of pending changelog. Flush should make sure of it.
 EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_0/a trusted.afr.dirty
 EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_1/a trusted.afr.dirty
 
 
-dd of=$M0/a if=/dev/urandom bs=1M count=1024 2>/dev/null &
+dd of=$M0/a if=/dev/urandom bs=1024k count=1024 2>/dev/null &
 p=$!
 #trigger graph switches, tests for fsync not leaving any pending flags
 TEST $CLI volume set $V0 performance.quick-read off
diff --git a/tests/bugs/bug-895235.t b/tests/bugs/bug-895235.t
index 0764b50d4e4..d02120c2796 100644
--- a/tests/bugs/bug-895235.t
+++ b/tests/bugs/bug-895235.t
@@ -15,7 +15,7 @@ TEST $CLI volume start $V0
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
 
 TEST gluster volume profile $V0 start
-TEST dd of=$M0/a if=/dev/zero bs=1M count=1 oflag=append
+TEST dd of=$M0/a if=/dev/zero bs=1024k count=1 oflag=append
 finodelk_max_latency=$($CLI volume profile $V0 info | grep FINODELK | awk 'BEGIN {max = 0} {if ($6 > max) max=$6;} END {print max}' | cut -d. -f 1 | egrep "[0-9]{7,}")
 
 TEST [ -z $finodelk_max_latency ]
diff --git a/tests/bugs/bug-913051.t b/tests/bugs/bug-913051.t
index cdf1bfcd1dc..1673cc6eaf5 100644
--- a/tests/bugs/bug-913051.t
+++ b/tests/bugs/bug-913051.t
@@ -48,8 +48,8 @@ EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/dir/b
 
 #attempt self-heal so that the files are created on brick-0
 
-TEST dd if=$M0/dir/a of=/dev/null bs=1M
-TEST dd if=$M0/dir/b of=/dev/null bs=1M
+TEST dd if=$M0/dir/a of=/dev/null bs=1024k
+TEST dd if=$M0/dir/b of=/dev/null bs=1024k
 
 #trigger writev for attempting open-fd-fix in afr
 TEST fd_write $wfd "open sesame"
diff --git a/tests/bugs/bug-921231.t b/tests/bugs/bug-921231.t
index db9cf3b6f06..79c7522a24a 100644
--- a/tests/bugs/bug-921231.t
+++ b/tests/bugs/bug-921231.t
@@ -8,7 +8,7 @@
 cleanup;
 
 function write_to_file {
-        dd of=$M0/1 if=/dev/zero bs=1M count=128 oflag=append 2>&1 >/dev/null
+        dd of=$M0/1 if=/dev/zero bs=1024k count=128 oflag=append 2>&1 >/dev/null
 }
 
 TEST glusterd
diff --git a/tests/bugs/bug-963678.t b/tests/bugs/bug-963678.t
index 00beccb9a39..ba3d3ae0549 100644
--- a/tests/bugs/bug-963678.t
+++ b/tests/bugs/bug-963678.t
@@ -42,7 +42,7 @@ TEST [ $(($blksz * $nblks)) -lt $((917504 + 16384)) ]
 TEST unlink $M0/file
 
 # write some data, punch a hole and verify the file content changes
-TEST dd if=/dev/urandom of=$M0/file bs=1M count=1
+TEST dd if=/dev/urandom of=$M0/file bs=1024k count=1
 TEST cp $M0/file $M0/file.copy.pre
 TEST fallocate -p -o 512k -l 128k $M0/file
 TEST cp $M0/file $M0/file.copy.post
diff --git a/tests/bugs/bug-977797.t b/tests/bugs/bug-977797.t
index a8b1ee7b4e4..339588adb52 100755
--- a/tests/bugs/bug-977797.t
+++ b/tests/bugs/bug-977797.t
@@ -54,7 +54,7 @@ TEST chmod 757 $M0/a/file
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1;
 
-TEST dd if=$M0/a/file of=/dev/null bs=1M
+TEST dd if=$M0/a/file of=/dev/null bs=1024k
 
 b1c0dir=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a \
           trusted.afr.$V0-client-0 "entry")
diff --git a/tests/bugs/bug-979365.t b/tests/bugs/bug-979365.t
index 7f92ea8d827..fa9e1de9381 100755
--- a/tests/bugs/bug-979365.t
+++ b/tests/bugs/bug-979365.t
@@ -20,7 +20,7 @@ TEST $CLI volume start $V0
 TEST $CLI volume profile $V0 start
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
 TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST dd of=$M0/a if=/dev/zero bs=1M count=10
+TEST dd of=$M0/a if=/dev/zero bs=1024k count=10
 #fsyncs take a while to complete.
 sleep 5
 
@@ -39,7 +39,7 @@ TEST $CLI volume start $V0
 TEST kill_brick $V0 $H0 $B0/${V0}0
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
 TEST $CLI volume profile $V0 start
-TEST dd of=$M0/a if=/dev/zero bs=1M count=10
+TEST dd of=$M0/a if=/dev/zero bs=1024k count=10
 #fsyncs take a while to complete.
 sleep 5
 TEST [[ $(num_fsyncs) -eq 0 ]]