andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/changelog: Avoid setattr fop logging during rename

Browse Source 
Problem:
        When a file is renamed and the (renamed)file's Hashing
falls into a different brick, DHT creates a special file(linkto file)
in the brick(Hashed subvolume) and carries out setattr operation
on that file.

Currently, Changelog records this(setattr) operation in Hashed
subvolume. glusterfind in turn records this operation
as MODIFY operation.

So, there is a NEW entry in Cached subvolume and MODIFY entry
in Hashed subvolume for the same file.

Solution:
        Avoid logging setattr operation carried out, by
marking the operation as internal fop using xdata.

In changelog translator, check whether setattr is set
as internal fop and skip accordingly.

Change-Id: I21b09afb5a638b88a4ccb822442216680b7b74fd
BUG: 1230007
Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
Reviewed-on: http://review.gluster.org/11137
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
This commit is contained in:
Saravanakumar Arumugam 2015-06-09 17:49:58 +05:30 committed by Raghavendra G
parent 3eafe6a81f
commit a6c53571a9
4 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xlators/cluster/dht/src/dht-common.h
View File

@ -577,6 +577,24 @@ typedef struct dht_migrate_info {
} while (0)
#define is_greater_time(a, an, b, bn) (((a) < (b)) || (((a) == (b)) && ((an) < (bn))))
#define DHT_MARK_FOP_INTERNAL(xattr) do { \
int tmp = -1; \
if (!xattr) { \
xattr = dict_new (); \
if (!xattr) \
break; \
} \
tmp = dict_set_str (xattr, GLUSTERFS_INTERNAL_FOP_KEY, "yes"); \
if (tmp) { \
gf_msg (this->name, GF_LOG_ERROR, 0, \
DHT_MSG_DICT_SET_FAILED, \
"Failed to set dictionary value: key = %s," \
" path = %s", GLUSTERFS_INTERNAL_FOP_KEY, \
local->loc.path); \
} \
} while (0)
dht_layout_t *dht_layout_new (xlator_t *this, int cnt);
dht_layout_t *dht_layout_get (xlator_t *this, inode_t *inode);
dht_layout_t *dht_layout_for_subvol (xlator_t *this, xlator_t *subvol);

23
xlators/cluster/dht/src/dht-linkfile.c
View File

@ -307,12 +307,13 @@ dht_linkfile_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int
dht_linkfile_attr_heal (call_frame_t *frame, xlator_t *this)
{
int ret = -1;
call_frame_t *copy = NULL;
dht_local_t *local = NULL;
dht_local_t *copy_local = NULL;
xlator_t *subvol = NULL;
struct iatt stbuf = {0,};
int ret = -1;
call_frame_t *copy = NULL;
dht_local_t *local = NULL;
dht_local_t *copy_local = NULL;
xlator_t *subvol = NULL;
struct iatt stbuf = {0,};
dict_t *xattr = NULL;
local = frame->local;
@ -322,6 +323,8 @@ dht_linkfile_attr_heal (call_frame_t *frame, xlator_t *this)
if (local->stbuf.ia_type == IA_INVAL)
return 0;
DHT_MARK_FOP_INTERNAL (xattr);
gf_uuid_copy (local->loc.gfid, local->stbuf.ia_gfid);
copy = copy_frame (frame);
@ -343,8 +346,14 @@ dht_linkfile_attr_heal (call_frame_t *frame, xlator_t *this)
STACK_WIND (copy, dht_linkfile_setattr_cbk, subvol,
subvol->fops->setattr, &copy_local->loc,
&stbuf, (GF_SET_ATTR_UID | GF_SET_ATTR_GID), NULL);
&stbuf, (GF_SET_ATTR_UID | GF_SET_ATTR_GID), xattr);
ret = 0;
out:
if ((ret < 0) && (copy))
DHT_STACK_DESTROY (copy);
if (xattr)
dict_unref (xattr);
return ret;
}

16
xlators/cluster/dht/src/dht-rename.c
View File

@ -364,22 +364,6 @@ dht_rename_track_for_changelog (xlator_t *this, dict_t *xattr,
}
#define DHT_MARK_FOP_INTERNAL(xattr) do { \
int tmp = -1; \
if (!xattr) { \
xattr = dict_new (); \
if (!xattr) \
break; \
} \
tmp = dict_set_str (xattr, GLUSTERFS_INTERNAL_FOP_KEY, "yes"); \
if (tmp) { \
gf_msg (this->name, GF_LOG_ERROR, 0, \
DHT_MSG_DICT_SET_FAILED, \
"Failed to set dictionary value: key = %s," \
" path = %s", GLUSTERFS_INTERNAL_FOP_KEY, \
local->loc.path); \
} \
}while (0)
#define DHT_MARKER_DONT_ACCOUNT(xattr) do { \
int tmp = -1; \

2
xlators/features/changelog/src/changelog.c
View File

@ -1215,6 +1215,8 @@ changelog_setattr (call_frame_t *frame,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
CHANGELOG_IF_INTERNAL_FOP_THEN_GOTO (frame, xdata, wind);
CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
CHANGELOG_INIT (this, frame->local,