From bdfd087d76cbf6336805c6c55c0e0935dfd29a9d Mon Sep 17 00:00:00 2001 From: Joseph Fernandes Date: Mon, 30 Nov 2015 16:51:35 +0530 Subject: tier/libgfdb/sql: Correcting logic in sql query for read Correcting query in the where clause from "a & b | c" to "a & (b | c)" where "a" is the condition to join the gf_file_tb and gf_flink_tb through gfids "b" is the condition for the write heat and "c" is the condition for read heat Change-Id: I99226d82b0efb68fbef3a40f02b215bb2b4370d6 BUG: 1286656 Signed-off-by: Joseph Fernandes Signed-off-by: Dan Lambright Reviewed-on: http://review.gluster.org/12823 Tested-by: NetBSD Build System Tested-by: Gluster Build System --- tests/basic/tier/frequency-counters.t | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tests/basic/tier') diff --git a/tests/basic/tier/frequency-counters.t b/tests/basic/tier/frequency-counters.t index 707b8b4bbc6..51c7ab4a700 100644 --- a/tests/basic/tier/frequency-counters.t +++ b/tests/basic/tier/frequency-counters.t @@ -40,7 +40,6 @@ TEST glusterd #Create and start a tiered volume create_dist_vol $NUM_BRICKS -$CLI volume set $V0 diagnostics.client-log-level DEBUG # Mount FUSE TEST glusterfs -s $H0 --volfile-id $V0 $M0 @@ -48,7 +47,8 @@ TEST glusterfs -s $H0 --volfile-id $V0 $M0 mkdir $M0/$TEST_DIR cd $M0/${TEST_DIR} -touch file{1..2} +date > file1 +touch file2 # attach tier create_dist_tier_vol $NUM_BRICKS @@ -56,19 +56,22 @@ create_dist_tier_vol $NUM_BRICKS sleep_until_mid_cycle $PROMOTE_FREQ # check if promotion on single hit, should fail -echo "hi" >> file2 +date >> file2 +cat file1 drop_cache $M0 sleep $PROMOTE_FREQ EXPECT "0" check_counters 0 0 # check if promotion on double hit, should suceed sleep_until_mid_cycle $PROMOTE_FREQ -echo "hi" >> file2 +date >> file2 drop_cache $M0 -echo "hi" >> file2 +cat file1 +date >> file2 drop_cache $M0 +cat file1 -EXPECT_WITHIN $PROMOTE_FREQ "0" check_counters 1 0 +EXPECT_WITHIN $PROMOTE_FREQ "0" check_counters 2 0 TEST ! $CLI volume set $V0 features.record-counters off -- cgit