diff options
| -rwxr-xr-x | tests/basic/tier/tier.t | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 308e22c74db..1798541becd 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -110,6 +110,7 @@ TEST $CLI volume set $V0 cluster.tier-max-files 1000 TEST $CLI volume set $V0 cluster.tier-max-promote-file-size 1000 TEST ! $CLI volume set $V0 cluster.tier-max-files -3 TEST ! $CLI volume set $V0 cluster.watermark-low 90 +TEST ! $CLI volume set $V0 cluster.watermark-hi 75 TEST ! $CLI volume set $V0 cluster.read-freq-threshold -12 TEST ! $CLI volume set $V0 cluster.write-freq-threshold -12 diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 1b26f7d8397..a5659248253 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -447,9 +447,10 @@ validate_tier (glusterd_volinfo_t *volinfo, dict_t *dict, char *key, gf_string2bytesize_uint64 (current_wm_low, &wm_low); } - if (wm_low > wm_hi) { + if (wm_low >= wm_hi) { snprintf (errstr, sizeof (errstr), "lower watermark" - " cannot exceed upper watermark."); + " cannot be equal or exceed upper " + "watermark."); gf_msg (this->name, GF_LOG_ERROR, EINVAL, GD_MSG_INCOMPATIBLE_VALUE, "%s", errstr); *op_errstr = gf_strdup (errstr); |