From 3d3176958b7da48dbacb1a5a0fedf26322a38297 Mon Sep 17 00:00:00 2001 From: vmallika Date: Thu, 15 Oct 2015 12:41:13 +0530 Subject: quota: add version to quota xattrs This is a backport of http://review.gluster.org/#/c/12386/ When a quota is disable and the clean-up process terminated without completely cleaning-up the quota xattrs. Now when quota is enabled again, this can mess-up the accounting A version number is suffixed for all quota xattrs and this version number is specific to marker xaltor, i.e when quota xattrs are requested by quotad/client marker will remove the version suffix in the key before sending the response > Change-Id: I1ca2c11460645edba0f6b68db70d476d8d26e1eb > BUG: 1272411 > Signed-off-by: vmallika > Reviewed-on: http://review.gluster.org/12386 > Tested-by: NetBSD Build System > Reviewed-by: Krishnan Parthasarathi > Tested-by: Gluster Build System > Reviewed-by: Manikandan Selvaganesh > Reviewed-by: Raghavendra G Change-Id: I67b1b930b28411d76b2d476a4e5250c52aa495a0 BUG: 1277080 Signed-off-by: vmallika Reviewed-on: http://review.gluster.org/12487 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Raghavendra G Tested-by: Raghavendra G --- xlators/mgmt/glusterd/src/glusterd-quota.c | 28 ++++++++++++++++++++-------- xlators/mgmt/glusterd/src/glusterd-store.c | 9 +++++++++ xlators/mgmt/glusterd/src/glusterd-store.h | 1 + xlators/mgmt/glusterd/src/glusterd-utils.c | 8 ++++++++ xlators/mgmt/glusterd/src/glusterd-volgen.c | 6 ++++++ xlators/mgmt/glusterd/src/glusterd.h | 1 + 6 files changed, 45 insertions(+), 8 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 22dd3d38d86..762e90b9238 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -1212,8 +1212,7 @@ glusterd_remove_quota_limit (char *volname, char *path, char **op_errstr, } if (type == GF_QUOTA_OPTION_TYPE_REMOVE) { - ret = sys_lremovexattr (abspath, - "trusted.glusterfs.quota.limit-set"); + ret = sys_lremovexattr (abspath, QUOTA_LIMIT_KEY); if (ret) { gf_asprintf (op_errstr, "removexattr failed on %s. " "Reason : %s", abspath, strerror (errno)); @@ -1222,8 +1221,7 @@ glusterd_remove_quota_limit (char *volname, char *path, char **op_errstr, } if (type == GF_QUOTA_OPTION_TYPE_REMOVE_OBJECTS) { - ret = sys_lremovexattr (abspath, - "trusted.glusterfs.quota.limit-objects"); + ret = sys_lremovexattr (abspath, QUOTA_LIMIT_OBJECTS_KEY); if (ret) { gf_asprintf (op_errstr, "removexattr failed on %s. " "Reason : %s", abspath, strerror (errno)); @@ -1499,19 +1497,33 @@ glusterd_op_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict) goto out; } + + if (GF_QUOTA_OPTION_TYPE_ENABLE == type) + volinfo->quota_version++; + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); + if (ret) { + if (GF_QUOTA_OPTION_TYPE_ENABLE == type) + volinfo->quota_version--; + goto out; + } + ret = glusterd_create_volfiles_and_notify_services (volinfo); if (ret) { gf_msg (this->name, GF_LOG_ERROR, 0, GD_MSG_VOLFILE_CREATE_FAIL, "Unable to re-create " "volfiles"); + if (GF_QUOTA_OPTION_TYPE_ENABLE == type) { + /* rollback volinfo */ + volinfo->quota_version--; + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); + } + ret = -1; goto out; } - ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); - if (ret) - goto out; - if (GLUSTERD_STATUS_STARTED == volinfo->status) { if (priv->op_version == GD_OP_VERSION_MIN) ret = priv->nfs_svc.manager (&(priv->nfs_svc), NULL, 0); diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index fcc35b56db8..44f137a3c04 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1012,6 +1012,12 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) goto out; } + snprintf (buf, sizeof (buf), "%d", volinfo->quota_version); + ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION, + buf); + if (ret) + goto out; + ret = glusterd_volume_write_tier_details (fd, volinfo); ret = glusterd_volume_write_snap_details (fd, volinfo); @@ -2670,6 +2676,9 @@ glusterd_store_update_volinfo (glusterd_volinfo_t *volinfo) } else if (!strncmp (key, GLUSTERD_STORE_KEY_COLD_TYPE, strlen (key))) { volinfo->tier_info.cold_type = atoi (value); + } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION, + strlen (GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION))) { + volinfo->quota_version = atoi (value); } else { if (is_key_glusterd_hooks_friendly (key)) { diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h index 5ba0add32c3..4933adbdf7b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.h +++ b/xlators/mgmt/glusterd/src/glusterd-store.h @@ -63,6 +63,7 @@ typedef enum glusterd_store_ver_ac_{ #define GLUSTERD_STORE_KEY_PARENT_VOLNAME "parent_volname" #define GLUSTERD_STORE_KEY_VOL_OP_VERSION "op-version" #define GLUSTERD_STORE_KEY_VOL_CLIENT_OP_VERSION "client-op-version" +#define GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION "quota-version" #define GLUSTERD_STORE_KEY_COLD_TYPE "cold_type" #define GLUSTERD_STORE_KEY_COLD_COUNT "cold_count" diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index b66cccde104..1a1a3b10c06 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -2493,6 +2493,9 @@ glusterd_add_volume_to_dict (glusterd_volinfo_t *volinfo, snprintf (key, sizeof (key), "%s%d.caps", prefix, count); ret = dict_set_int32 (dict, key, volinfo->caps); + memset (key, 0, sizeof (key)); + snprintf (key, sizeof (key), "%s%d.quota-version", prefix, count); + ret = dict_set_int32 (dict, key, volinfo->quota_version); out: GF_FREE (volume_id_str); GF_FREE (rebalance_id_str); @@ -3573,6 +3576,11 @@ glusterd_import_volinfo (dict_t *peer_data, int count, /*This is not present in older glusterfs versions, so ignore ret value*/ ret = dict_get_int32 (peer_data, key, &new_volinfo->caps); + memset (key, 0, sizeof (key)); + snprintf (key, sizeof (key), "%s%d.quota_version", prefix, count); + /*This is not present in older glusterfs versions, so ignore ret value*/ + ret = dict_get_int32 (peer_data, key, &new_volinfo->quota_version); + ret = glusterd_import_bricks (peer_data, count, new_volinfo, prefix); if (ret) goto out; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index a497129497f..cb25dd8c20f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1868,6 +1868,7 @@ brick_graph_add_marker (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, xlator_t *xl = NULL; char tstamp_file[PATH_MAX] = {0,}; char volume_id[64] = {0,}; + char buf[32] = {0,}; if (!graph || !volinfo || !set_dict) goto out; @@ -1885,6 +1886,11 @@ brick_graph_add_marker (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, if (ret) goto out; + snprintf (buf, sizeof (buf), "%d", volinfo->quota_version); + ret = xlator_set_option (xl, "quota-version", buf); + if (ret) + goto out; + out: return ret; } diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index aabfb2bc0bf..0f668c2016e 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -411,6 +411,7 @@ struct glusterd_volinfo_ { gd_quorum_status_t quorum_status; glusterd_snapdsvc_t snapd; + int32_t quota_version; }; typedef enum gd_snap_status_ { -- cgit