diff options
| author | N Balachandran <nbalacha@redhat.com> | 2017-07-14 15:18:19 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2017-12-26 05:25:33 +0000 |
| commit | 85a389cfced2c299faa37b6f930c2cd0ca8c72b9 (patch) | |
| tree | 09099228c814ae9f4ab5f48b9b62f00dea72d297 /xlators/storage | |
| parent | f13023862edc868d4da87609412341aecd041ed8 (diff) | |
cluster/dht: Add migration checks to dht_(f)xattrop
The dht_(f)xattrop implementation did not implement
migration phase1/phase2 checks which could cause issues
with rebalance on sharded volumes.
This does not solve the issue where fops may reach the target
out of order.
Change-Id: I2416fc35115e60659e35b4b717fd51f20746586c
BUG: 1471031
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Diffstat (limited to 'xlators/storage')
| -rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 32 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix-inode-fd-ops.c | 1 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix.h | 3 |
3 files changed, 36 insertions, 0 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 525f65f7eba..39d29f413a8 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -153,6 +153,38 @@ out: return ret; } + +int32_t +posix_set_mode_in_dict (dict_t *in_dict, dict_t *out_dict, + struct iatt *in_stbuf) +{ + int ret = -1; + mode_t mode = 0; + + if ((!in_dict) || (!in_stbuf) || (!out_dict)) { + goto out; + } + + /* We need this only for files */ + if (!(IA_ISREG (in_stbuf->ia_type))) { + ret = 0; + goto out; + } + + /* Nobody asked for this */ + if (!dict_get (in_dict, DHT_MODE_IN_XDATA_KEY)) { + ret = 0; + goto out; + } + mode = st_mode_from_ia (in_stbuf->ia_prot, in_stbuf->ia_type); + + ret = dict_set_int32 (out_dict, DHT_MODE_IN_XDATA_KEY, mode); + +out: + return ret; +} + + static gf_boolean_t posix_xattr_ignorable (char *key) { diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c index 2a3c7a2b025..8cb7630c599 100644 --- a/xlators/storage/posix/src/posix-inode-fd-ops.c +++ b/xlators/storage/posix/src/posix-inode-fd-ops.c @@ -4143,6 +4143,7 @@ do_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, op_ret = -1; op_errno = ENOMEM; } + posix_set_mode_in_dict (xdata, xdata_rsp, &stbuf); out: STACK_UNWIND_STRICT (xattrop, frame, op_ret, op_errno, xattr_rsp, diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h index f9ab3ec9e75..c4c28d59977 100644 --- a/xlators/storage/posix/src/posix.h +++ b/xlators/storage/posix/src/posix.h @@ -610,4 +610,7 @@ int32_t posix_rchecksum (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, int32_t len, dict_t *xdata); +int32_t +posix_set_mode_in_dict (dict_t *in_dict, dict_t *out_dict, + struct iatt *in_stbuf); #endif /* _POSIX_H */ |