diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2018-07-14 10:05:41 +0530 |
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2018-07-19 05:05:55 +0000 |
| commit | 9ab218be5e69b9f71fe4eea9ca8d114b78cafd25 (patch) | |
| tree | f1a69791f51b089a5b2b4a17800bce313a652f08 /xlators/storage/posix | |
| parent | 730542a5d8c3d9be2202d3c26e9ff5c9404e3fe2 (diff) | |
posix: check before removing stale symlink
BZ 1564071 complains of directories with missing gfid symlinks and
corresponding "Found stale gfid handle" messages in the logs. Hence
add a check to see if the symlink points to an actual directory before
removing it.
Note: Removing stale symlinks was added via commit
3e9a9c029fac359477fb26d9cc7803749ba038b2
Change-Id: I5d91fab8e5f3a621a9ecad4a1f9c898a3c2d346a
Updates: bz#1564071
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Diffstat (limited to 'xlators/storage/posix')
| -rw-r--r-- | xlators/storage/posix/src/posix-entry-ops.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c index 9089603c0fa..cb96d76332a 100644 --- a/xlators/storage/posix/src/posix-entry-ops.c +++ b/xlators/storage/posix/src/posix-entry-ops.c @@ -224,20 +224,24 @@ posix_lookup (call_frame_t *frame, xlator_t *this, "lstat on %s failed", real_path ? real_path : "null"); } + entry_ret = -1; if (loc_is_nameless(loc)) { if (!op_errno) op_errno = ESTALE; loc_gfid (loc, gfid); MAKE_HANDLE_ABSPATH (gfid_path, this, gfid); - op_ret = sys_lstat(gfid_path, &statbuf); - if (op_ret == 0 && statbuf.st_nlink == 1) { - gf_msg (this->name, GF_LOG_WARNING, ESTALE, + ret = sys_stat(gfid_path, &statbuf); + if (ret == 0 && ((statbuf.st_mode & S_IFMT) == S_IFDIR)) + /*Don't unset if it was a symlink to a dir.*/ + goto parent; + ret = sys_lstat(gfid_path, &statbuf); + if (ret == 0 && statbuf.st_nlink == 1) { + gf_msg (this->name, GF_LOG_WARNING, op_errno, P_MSG_HANDLE_DELETE, "Found stale gfid " "handle %s, removing it.", gfid_path); posix_handle_unset (this, gfid, NULL); } } - entry_ret = -1; goto parent; } |