diff options
author | vmallika <vmallika@redhat.com> | 2015-07-12 08:49:49 +0530 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2015-08-19 10:43:54 -0700 |
commit | 4efc8ea17f8452cf5a5f3a504419c1269d332d79 (patch) | |
tree | 05a385130b54d282766baf5db74be8178b1dcc4c /xlators/features/marker/src/marker.h | |
parent | d290dc62e474cfe4a305f503dff815c73d3f2578 (diff) |
quota/marker: fix inode quota with rename
There are three problems with marker-rename which
is fixed in this patch
Problem 1)
1) mq_reduce_parent_size is not handling inode-quota contribution
2) When dest files exists and IO is happening
Now renaming will overwrite existing file
mq_reduce_parent_size called on dest file
with saved contribution, this can be
a problem is IO is still happening
contribution might have changed
Problem 2)
There is a small race between rename and in-progress write
Consider below scenario
1) rename FOP invoked on file 'x'
2) write is still in progress for file 'x'
3) rename takes a lock on old-parent
4) write-update txn blocked on old-parent to acquire lock
5) in rename_cbk, contri xattrs are removed and contribution is deleted and
lock is released
6) now write-update txn gets the lock and updates the wrong parent
as it was holding lock on old parent
so validate parent once the lock is acquired
Problem 3)
when a rename operation is performed, a lock is
held on old parent. This lock is release before
unwinding the rename operation.
This can be a problem if there are in-progress
writes happening during rename, where update txn
can take a lock and update the old parent
as inode table is not updated with new parent
Change-Id: Ic3316097c001c33533f98592e8fcf234b1ee2aa2
BUG: 1240991
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11578
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/marker/src/marker.h')
-rw-r--r-- | xlators/features/marker/src/marker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index 6e43e74d5a6..228fd6fa5d8 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -92,7 +92,6 @@ struct marker_local{ pid_t pid; loc_t loc; loc_t parent_loc; - loc_t *next_lock_on; uid_t uid; gid_t gid; int32_t ref; @@ -101,7 +100,8 @@ struct marker_local{ mode_t mode; int32_t err; call_stub_t *stub; - int64_t contribution; + call_frame_t *lk_frame; + quota_meta_t contribution; struct marker_local *oplocal; /* marker quota specific */ |