diff options
| author | Joseph Fernandes <josferna@redhat.com> | 2015-03-30 17:23:29 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-03-30 13:39:20 -0700 |
| commit | 3feaf1648528ff39e23748ac9004a77595460c9d (patch) | |
| tree | b597abf46bb8a337dbd089f431b53344eac30128 | |
| parent | 3fdecc25b4059e357a3bdce428bbafdf04377e14 (diff) | |
Gfdb Query Fix and Volume option fix
1) Query fix in find_changed_with_freq()
2) Volume option typo fix for write_freq_threshold
and read_freq_threshold
Change-Id: I38e154818178aab412b2d7b2914cd29acef66ffb
BUG: 1207343
Signed-off-by: Joseph Fernandes <josferna@redhat.com>
Reviewed-on: http://review.gluster.org/10050
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 818691d7cea..fa654840803 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -847,12 +847,12 @@ gf_sqlite3_find_recently_changed_files_freq (void *db_conn, /*First condition: For Writes*/ "( ((" GF_COL_TB_WSEC " * " TOSTRING(GFDB_MICROSEC) " + " GF_COL_TB_WMSEC ") >= ? )" - " AND "" (" GF_COL_TB_WFC " > = ? ) )" + " AND "" (" GF_COL_TB_WFC " >= ? ) )" " OR " /*Second condition: For Reads */ "( ((" GF_COL_TB_RWSEC " * " TOSTRING(GFDB_MICROSEC) " + " GF_COL_TB_RWMSEC ") <= ?)" - " AND "" (" GF_COL_TB_RFC " > = ? ) )"; + " AND "" (" GF_COL_TB_RFC " >= ? ) )"; from_time_usec = gfdb_time_2_usec(from_time); diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 1e666bd8140..06d0a5db6ae 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -864,14 +864,14 @@ struct volume_options options[] = { .description = "Frequency to demote files to slow tier" }, - { .key = {"write-freq-thresold"}, + { .key = {"write-freq-threshold"}, .type = GF_OPTION_TYPE_INT, .default_value = "0", .description = "Defines the write fequency " "that would be considered hot" }, - { .key = {"read-freq-thresold"}, + { .key = {"read-freq-threshold"}, .type = GF_OPTION_TYPE_INT, .default_value = "0", .description = "Defines the read fequency " diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 4637bda59c6..bad7e63d309 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1691,15 +1691,15 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, /* tier translator - global tunables */ - { .key = "cluster.write-freq-thresold", + { .key = "cluster.write-freq-threshold", .voltype = "cluster/tier", - .option = "write-freq-thresold", + .option = "write-freq-threshold", .op_version = GD_OP_VERSION_3_7_0, .flags = OPT_FLAG_CLIENT_OPT }, - { .key = "cluster.read-freq-thresold", + { .key = "cluster.read-freq-threshold", .voltype = "cluster/tier", - .option = "read-freq-thresold", + .option = "read-freq-threshold", .op_version = GD_OP_VERSION_3_7_0, .flags = OPT_FLAG_CLIENT_OPT }, |