diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2015-10-05 15:30:03 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-10-05 06:37:50 -0700 |
| commit | 032ca47a4356a68522f5366a341d78b01ca9864c (patch) | |
| tree | f90849509f008a003c9b8f3a30422200d5e6210a | |
| parent | c62dcfff26082b4c2d23e89f905bd85f865211db (diff) | |
features/shard: Use the xattr rsp dict to pick shard xattrs in xattrop cbk
The change http://review.gluster.org/#/c/11938/ makes a fix in posix translator
which would cause sharding to fail fops post xattrop without this patch.
Change-Id: If096965b319f393608b0f763402b9b90acb61492
BUG: 1268796
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/12300
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
| -rwxr-xr-x | run-tests.sh | 1 | ||||
| -rw-r--r-- | xlators/features/shard/src/shard.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/run-tests.sh b/run-tests.sh index d5730d422b8..b8eb8e40fef 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -204,7 +204,6 @@ function is_bad_test () ./tests/geo-rep/georep-basic-dr-rsync.t \ ./tests/geo-rep/georep-basic-dr-tarssh.t \ ./tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t \ - ./tests/bugs/shard/bug-1245547.t \ ; do [ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success done diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index 289f8e48ba9..aee6ed3ce45 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -396,7 +396,7 @@ shard_update_file_size_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto err; } - if (shard_modify_size_and_block_count (&local->postbuf, xdata)) { + if (shard_modify_size_and_block_count (&local->postbuf, dict)) { local->op_ret = -1; local->op_errno = ENOMEM; goto err; |