summaryrefslogtreecommitdiffstats
path: root/xlators/features/quota/src/quotad-aggregator.h
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2019-01-18 11:00:56 +0800
committerAmar Tumballi <amarts@redhat.com>2019-03-04 09:13:06 +0000
commit2b51b89f0f67ba1f7655cadb3fab9b4d3766faa6 (patch)
tree2e0122b1736d3afc09dbb7fa52d56781cd735eda /xlators/features/quota/src/quotad-aggregator.h
parent16b4936696c8b602243513fbde0b20a1e8417432 (diff)
quotad: fix passing GF_DATA_TYPE_STR_OLD dict data to v4 protocol
quotad prints many logs as, [glusterfs3.h:752:dict_to_xdr] 0-dict: key 'trusted.glusterfs.quota.size' is not sent on wire [Invalid argument] [glusterfs3.h:752:dict_to_xdr] 0-dict: key 'volume-uuid' is not sent on wire [Invalid argument] For quota, there is a deamon named quotad which has a rpcsvc_program quotad_aggregator_prog that only supports v3 right now. Quotad has two actors (LOOKUP,GETLIMIT) that contains a dict in request, quotad just decodes the dict by dict_unserialize, those dict dates's type is GF_DATA_TYPE_STR_OLD, which type is not supported at glusterfs v4. Change-Id: Ib649d7a2e3c68c32dc26bc0f88923a0ba967ebd7 Updates: bz#1596787 Signed-off-by: Kinglong Mee <mijinlong@open-fs.com>
Diffstat (limited to 'xlators/features/quota/src/quotad-aggregator.h')
-rw-r--r--xlators/features/quota/src/quotad-aggregator.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/features/quota/src/quotad-aggregator.h b/xlators/features/quota/src/quotad-aggregator.h
index 318ad7f4995..706592c7d50 100644
--- a/xlators/features/quota/src/quotad-aggregator.h
+++ b/xlators/features/quota/src/quotad-aggregator.h
@@ -23,13 +23,15 @@ typedef struct {
inode_table_t *itable;
loc_t loc;
dict_t *xdata;
+ dict_t *req_xdata;
} quotad_aggregator_state_t;
typedef int (*quotad_aggregator_lookup_cbk_t)(xlator_t *this,
call_frame_t *frame, void *rsp);
int
qd_nameless_lookup(xlator_t *this, call_frame_t *frame, char *gfid,
- dict_t *xdata, quotad_aggregator_lookup_cbk_t lookup_cbk);
+ dict_t *xdata, char *volume_uuid,
+ quotad_aggregator_lookup_cbk_t lookup_cbk);
int
quotad_aggregator_init(xlator_t *this);