diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2013-09-16 04:00:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <review@dev.gluster.org> | 2013-09-16 04:00:27 -0700 |
| commit | 696f44a4dcce9f83aac75d90ea2b7986e36c8f1c (patch) | |
| tree | 3aeeabc20573c88702def95a1a7106e6bddf9648 | |
| parent | c65ad1a35e61ca4b36a90887fa11c989371ccb91 (diff) | |
| parent | 34ffc3b71ad96b9be6fa34cad44f92eceb56f5e7 (diff) | |
Merge "glusterd: Relax op-version check in quota command" into upstream_on_quota
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-quota.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index e4c654b9..3bcf54b5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -102,16 +102,6 @@ __glusterd_handle_quota (rpcsvc_request_t *req) goto out; } - if ((conf->op_version == GD_OP_VERSION_MIN) && - (type > GF_QUOTA_OPTION_TYPE_VERSION)) { - snprintf (msg, sizeof (msg), "Cannot execute command. The " - "cluster is operating at version 1. Executing command " - "%s is disallowed in this state", - gd_quota_op_list[type]); - ret = -1; - goto out; - } - ret = glusterd_op_begin_synctask (req, GD_OP_QUOTA, dict); out: @@ -1106,17 +1096,6 @@ glusterd_op_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict) ret = dict_get_int32 (dict, "type", &type); - if ((priv->op_version == GD_OP_VERSION_MIN) && - (type > GF_QUOTA_OPTION_TYPE_VERSION)) { - gf_asprintf (op_errstr, "Volume quota failed. The cluster is " - "operating at version %d. Option %s " - "is disallowed in this state.", - priv->op_version, - gd_quota_op_list[type]); - ret = -1; - goto out; - } - switch (type) { case GF_QUOTA_OPTION_TYPE_ENABLE: ret = glusterd_quota_enable (volinfo, op_errstr, @@ -1363,17 +1342,6 @@ glusterd_op_stage_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict) goto out; } - if ((priv->op_version == GD_OP_VERSION_MIN) && - (type > GF_QUOTA_OPTION_TYPE_VERSION)) { - gf_asprintf (op_errstr, "Volume quota failed. The cluster is " - "operating at version %d. Option %s " - "is disallowed in this state.", - priv->op_version, - gd_quota_op_list[type]); - ret = -1; - goto out; - } - ctx = glusterd_op_get_ctx(); if (ctx && (type == GF_QUOTA_OPTION_TYPE_ENABLE || type == GF_QUOTA_OPTION_TYPE_LIST)) { |