diff options
author | Hari Gowtham <hgowtham@dhcp35-85.lab.eng.blr.redhat.com> | 2015-05-27 13:17:30 +0530 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-06-24 23:59:47 -0700 |
commit | 7b7e82f8770643e9edd5650340a387ea70e771f2 (patch) | |
tree | fba10fa9d5f0926ca24cb3320008d0e18dd18de5 /xlators/storage/posix/src/posix-helpers.c | |
parent | 3e9bc0b4a00e006410521a78011a8feae0af9234 (diff) |
Porting new log messages for posix
Backport of http://review.gluster.org/#/c/9893/
Cherry picked from 59e1c79ac6953e552fbdc8c627f5dc1d02eeacc8
>Change-Id: I29bdeefb755805858e3cb1817b679cb6f9a476a9
>BUG: 1194640
>Signed-off-by: Hari Gowtham <hgowtham@dhcp35-85.lab.eng.blr.redhat.com>
>Reviewed-on: http://review.gluster.org/9893
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
Change-Id: I29bdeefb755805858e3cb1817b679cb6f9a476a9
BUG: 1217722
Signed-off-by: Hari Gowtham <hgowtham@dhcp35-85.lab.eng.blr.redhat.com>
Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/11279
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators/storage/posix/src/posix-helpers.c')
-rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 323 |
1 files changed, 183 insertions, 140 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 9018a739f83..e2c5eb2c8ff 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -143,11 +143,13 @@ _posix_xattr_get_set_from_backend (posix_xattr_filler_t *filler, char *key) xattr_size); if (xattr_size == -1) { if (filler->real_path) - gf_log (filler->this->name, GF_LOG_WARNING, + gf_msg (filler->this->name, GF_LOG_WARNING, 0, + P_MSG_XATTR_FAILED, "getxattr failed. path: %s, key: %s", filler->real_path, key); else - gf_log (filler->this->name, GF_LOG_WARNING, + gf_msg (filler->this->name, GF_LOG_WARNING, 0, + P_MSG_XATTR_FAILED, "getxattr failed. gfid: %s, key: %s", uuid_utoa (filler->fd->inode->gfid), key); @@ -159,11 +161,11 @@ _posix_xattr_get_set_from_backend (posix_xattr_filler_t *filler, char *key) ret = dict_set_bin (filler->xattr, key, value, xattr_size); if (ret < 0) { if (filler->real_path) - gf_log (filler->this->name, GF_LOG_DEBUG, + gf_msg_debug (filler->this->name, 0, "dict set failed. path: %s, key: %s", filler->real_path, key); else - gf_log (filler->this->name, GF_LOG_DEBUG, + gf_msg_debug (filler->this->name, 0, "dict set failed. gfid: %s, key: %s", uuid_utoa (filler->fd->inode->gfid), key); @@ -198,14 +200,15 @@ _posix_get_marker_all_contributions (posix_xattr_filler_t *filler) " with 'user_xattr' flag)"); } else { if (filler->real_path) - gf_log (THIS->name, GF_LOG_WARNING, - "listxattr failed on %s: %s", - filler->real_path, strerror (errno)); + gf_msg (THIS->name, GF_LOG_WARNING, errno, + P_MSG_XATTR_FAILED, + "listxattr failed on %s", + filler->real_path); else - gf_log (THIS->name, GF_LOG_WARNING, - "listxattr failed on %s: %s", - uuid_utoa (filler->fd->inode->gfid), - strerror (errno)); + gf_msg (THIS->name, GF_LOG_WARNING, errno, + P_MSG_XATTR_FAILED, + "listxattr failed on %s", + uuid_utoa (filler->fd->inode->gfid)); } goto out; } @@ -295,7 +298,8 @@ _posix_filler_get_openfd_count (posix_xattr_filler_t *filler, char *key) ret = dict_set_uint32 (filler->xattr, key, inode->fd_count); if (ret < 0) { - gf_log (filler->this->name, GF_LOG_WARNING, + gf_msg (filler->this->name, GF_LOG_WARNING, 0, + P_MSG_DICT_SET_FAILED, "Failed to set dictionary value for %s", key); goto out; } @@ -328,9 +332,10 @@ _posix_xattr_get_set (dict_t *xattr_req, char *key, data_t *data, if (req_size >= filler->stbuf->ia_size) { _fd = open (filler->real_path, O_RDONLY); if (_fd == -1) { - gf_log (filler->this->name, GF_LOG_ERROR, - "Opening file %s failed: %s", - filler->real_path, strerror (errno)); + gf_msg (filler->this->name, GF_LOG_ERROR, errno, + P_MSG_XDATA_GETXATTR, + "Opening file %s failed", + filler->real_path); goto err; } @@ -352,26 +357,30 @@ _posix_xattr_get_set (dict_t *xattr_req, char *key, data_t *data, ret = read (_fd, databuf, filler->stbuf->ia_size); if (ret == -1) { - gf_log (filler->this->name, GF_LOG_ERROR, - "Read on file %s failed: %s", - filler->real_path, strerror (errno)); + gf_msg (filler->this->name, GF_LOG_ERROR, errno, + P_MSG_XDATA_GETXATTR, + "Read on file %s failed", + filler->real_path); goto err; } ret = close (_fd); _fd = -1; if (ret == -1) { - gf_log (filler->this->name, GF_LOG_ERROR, - "Close on file %s failed: %s", - filler->real_path, strerror (errno)); + gf_msg (filler->this->name, GF_LOG_ERROR, errno, + P_MSG_XDATA_GETXATTR, + "Close on file %s failed", + filler->real_path); goto err; } ret = dict_set_bin (filler->xattr, key, databuf, filler->stbuf->ia_size); if (ret < 0) { - gf_log (filler->this->name, GF_LOG_ERROR, - "failed to set dict value. key: %s, path: %s", + gf_msg (filler->this->name, GF_LOG_ERROR, 0, + P_MSG_XDATA_GETXATTR, + "failed to set dict value. key: %s," + "path: %s", key, filler->real_path); goto err; } @@ -385,6 +394,16 @@ _posix_xattr_get_set (dict_t *xattr_req, char *key, data_t *data, } } else if (!strcmp (key, GLUSTERFS_OPEN_FD_COUNT)) { ret = _posix_filler_get_openfd_count (filler, key); + loc = filler->loc; + if (loc) { + ret = dict_set_uint32 (filler->xattr, key, + loc->inode->fd_count); + if (ret < 0) + gf_msg (filler->this->name, GF_LOG_WARNING, 0, + P_MSG_XDATA_GETXATTR, + "Failed to set dictionary value for %s", + key); + } } else if (!strcmp (key, GET_ANCESTRY_PATH_KEY)) { /* As of now, the only consumers of POSIX_ANCESTRY_PATH attempt * fetching it via path-based fops. Hence, leaving it as it is @@ -524,7 +543,8 @@ posix_istat (xlator_t *this, uuid_t gfid, const char *basename, MAKE_HANDLE_PATH (real_path, this, gfid, basename); if (!real_path) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, ESTALE, + P_MSG_HANDLE_PATH_CREATE, "Failed to create handle path for %s/%s", uuid_utoa (gfid), basename ? basename : ""); errno = ESTALE; @@ -537,16 +557,17 @@ posix_istat (xlator_t *this, uuid_t gfid, const char *basename, if (ret != 0) { if (ret == -1) { if (errno != ENOENT && errno != ELOOP) - gf_log (this->name, GF_LOG_WARNING, - "lstat failed on %s (%s)", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_LSTAT_FAILED, + "lstat failed on %s", + real_path); } else { // may be some backend filesystem issue - gf_log (this->name, GF_LOG_ERROR, "lstat failed on " - "%s and return value is %d instead of -1. " - "Please see dmesg output to check whether the " - "failure is due to backend filesystem issue", - real_path, ret); + gf_msg (this->name, GF_LOG_ERROR, 0, P_MSG_LSTAT_FAILED, + "lstat failed on %s and return value is %d " + "instead of -1. Please see dmesg output to " + "check whether the failure is due to backend " + "filesystem issue", real_path, ret); ret = -1; } goto out; @@ -595,16 +616,17 @@ posix_pstat (xlator_t *this, uuid_t gfid, const char *path, if (ret != 0) { if (ret == -1) { if (errno != ENOENT) - gf_log (this->name, GF_LOG_WARNING, - "lstat failed on %s (%s)", - path, strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_LSTAT_FAILED, + "lstat failed on %s", + path); } else { // may be some backend filesytem issue - gf_log (this->name, GF_LOG_ERROR, "lstat failed on " - "%s and return value is %d instead of -1. " - "Please see dmesg output to check whether the " - "failure is due to backend filesystem issue", - path, ret); + gf_msg (this->name, GF_LOG_ERROR, 0, P_MSG_LSTAT_FAILED, + "lstat failed on %s and return value is %d " + "instead of -1. Please see dmesg output to " + "check whether the failure is due to backend " + "filesystem issue", path, ret); ret = -1; } goto out; @@ -768,7 +790,7 @@ posix_gfid_set (xlator_t *this, const char *path, loc_t *loc, dict_t *xattr_req) ret = dict_get_ptr (xattr_req, "gfid-req", &uuid_req); if (ret) { - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "failed to get the gfid from dict for %s", loc->path); goto out; @@ -776,9 +798,8 @@ posix_gfid_set (xlator_t *this, const char *path, loc_t *loc, dict_t *xattr_req) ret = sys_lsetxattr (path, GFID_XATTR_KEY, uuid_req, 16, XATTR_CREATE); if (ret == -1) { - gf_log (this->name, GF_LOG_WARNING, - "setting GFID on %s failed (%s)", path, - strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, P_MSG_GFID_FAILED, + "setting GFID on %s failed ", path); goto out; } gf_uuid_copy (uuid_curr, uuid_req); @@ -824,19 +845,20 @@ posix_set_file_contents (xlator_t *this, const char *path, char *keyp, ret = write (file_fd, value->data, value->len); if (ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, - "write failed while doing setxattr " - "for key %s on path %s: %s", - key, real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_SET_FILE_CONTENTS, "write failed" + "while doing setxattr for key %s on" + "path%s", key, real_path); goto out; } ret = close (file_fd); if (ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, - "close failed on %s: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_SET_FILE_CONTENTS, + "close failed on %s", + real_path); goto out; } } @@ -847,29 +869,28 @@ posix_set_file_contents (xlator_t *this, const char *path, char *keyp, if (file_fd == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, - "failed to open file %s with O_CREAT: %s", - key, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_SET_FILE_CONTENTS, "failed to open file" + "%s with O_CREAT", key); goto out; } ret = write (file_fd, value->data, value->len); if (ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, - "write failed on %s while setxattr with " - "key %s: %s", - real_path, key, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_SET_FILE_CONTENTS, "write failed on %s" + "while setxattr with key %s", real_path, key); goto out; } ret = close (file_fd); if (ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, - "close failed on %s while setxattr with " - "key %s: %s", - real_path, key, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_SET_FILE_CONTENTS, "close failed on" + " %s while setxattr with key %s", + real_path, key); goto out; } } @@ -893,7 +914,8 @@ posix_get_file_contents (xlator_t *this, uuid_t pargfid, MAKE_HANDLE_PATH (real_path, this, pargfid, name); if (!real_path) { op_ret = -ESTALE; - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, ESTALE, + P_MSG_XDATA_GETXATTR, "Failed to create handle path for %s/%s", uuid_utoa (pargfid), name); goto out; @@ -902,8 +924,8 @@ posix_get_file_contents (xlator_t *this, uuid_t pargfid, op_ret = posix_istat (this, pargfid, name, &stbuf); if (op_ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, "lstat failed on %s: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_XDATA_GETXATTR, + "lstat failed on %s", real_path); goto out; } @@ -911,8 +933,8 @@ posix_get_file_contents (xlator_t *this, uuid_t pargfid, if (file_fd == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, "open failed on %s: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_XDATA_GETXATTR, + "open failed on %s", real_path); goto out; } @@ -926,8 +948,8 @@ posix_get_file_contents (xlator_t *this, uuid_t pargfid, ret = read (file_fd, *contents, stbuf.ia_size); if (ret <= 0) { op_ret = -1; - gf_log (this->name, GF_LOG_ERROR, "read on %s failed: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_XDATA_GETXATTR, + "read on %s failed", real_path); goto out; } @@ -937,8 +959,8 @@ posix_get_file_contents (xlator_t *this, uuid_t pargfid, file_fd = -1; if (op_ret == -1) { op_ret = -errno; - gf_log (this->name, GF_LOG_ERROR, "close on %s failed: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_XDATA_GETXATTR, + "close on %s failed", real_path); goto out; } @@ -1039,7 +1061,7 @@ void posix_dump_buffer (xlator_t *this, const char *real_path, const char *key, for (index = 0; index < value->len; index++) sprintf(buffer+3*index, " %02x", data[index]); } - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "Dump %s: key:%s flags: %u length:%u data:%s ", real_path, key, flags, value->len, (log_level == GF_LOG_TRACE ? buffer : "<skipped in DEBUG>")); @@ -1072,24 +1094,33 @@ posix_handle_pair (xlator_t *this, const char *real_path, if (errno == ENOENT) { if (!posix_special_xattr (marker_xattrs, key)) { - gf_log (this->name, GF_LOG_ERROR, - "setxattr on %s failed: %s", - real_path, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_XATTR_FAILED, + "setxattr on %s failed", + real_path); } } else { #ifdef GF_DARWIN_HOST_OS - gf_log (this->name, - ((errno == EINVAL) ? - GF_LOG_DEBUG : GF_LOG_ERROR), - "%s: key:%s flags: %u length:%d error:%s", - real_path, key, flags, value->len, - strerror (errno)); + if (errno == EINVAL) { + gf_msg_debug (this->name, 0, "%s: key:" + "%s flags: %u length:%d " + "error:%s", real_path, + key, flags, value->len, + strerror (errno)); + } else { + gf_msg (this->name, GF_LOG_ERROR, + errno, P_MSG_XATTR_FAILED, + "%s: key:%s flags: " + "%u length:%d", + real_path, key, flags, + value->len); + #else /* ! DARWIN */ - gf_log (this->name, GF_LOG_ERROR, - "%s: key:%s flags: %u length:%d error:%s", - real_path, key, flags, value->len, - strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_XATTR_FAILED, "%s: key:%s" + "flags: %u length:%d", real_path, + key, flags, value->len); #endif /* DARWIN */ } @@ -1118,21 +1149,26 @@ posix_fhandle_pair (xlator_t *this, int fd, if (sys_ret < 0) { ret = -errno; if (errno == ENOENT) { - gf_log (this->name, GF_LOG_ERROR, - "fsetxattr on fd=%d failed: %s", fd, - strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_XATTR_FAILED, "fsetxattr on fd=%d" + " failed", fd); } else { #ifdef GF_DARWIN_HOST_OS - gf_log (this->name, - ((errno == EINVAL) ? - GF_LOG_DEBUG : GF_LOG_ERROR), - "fd=%d: key:%s error:%s", - fd, key, strerror (errno)); + if (errno == EINVAL) { + gf_msg_debug (this->name, 0, "fd=%d: key:%s " + "error:%s", fd, key, + strerror (errno)); + } else { + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_XATTR_FAILED, "fd=%d: key:%s", + fd, key); + } + #else /* ! DARWIN */ - gf_log (this->name, GF_LOG_ERROR, - "fd=%d: key:%s error:%s", - fd, key, strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_XATTR_FAILED, "fd=%d: key:%s", + fd, key); #endif /* DARWIN */ } @@ -1159,14 +1195,14 @@ del_stale_dir_handle (xlator_t *this, uuid_t gfid) /* check that it is valid directory handle */ size = sys_lstat (hpath, &stbuf); if (size < 0) { - gf_log (this->name, GF_LOG_DEBUG, "%s: Handle stat failed: " + gf_msg_debug (this->name, 0, "%s: Handle stat failed: " "%s", hpath, strerror (errno)); goto out; } iatt_from_stat (&iabuf, &stbuf); if (iabuf.ia_nlink != 1 || !IA_ISLNK (iabuf.ia_type)) { - gf_log (this->name, GF_LOG_DEBUG, "%s: Handle nlink %d %d", + gf_msg_debug (this->name, 0, "%s: Handle nlink %d %d", hpath, iabuf.ia_nlink, IA_ISLNK (iabuf.ia_type)); goto out; } @@ -1174,7 +1210,7 @@ del_stale_dir_handle (xlator_t *this, uuid_t gfid) size = posix_handle_path (this, gfid, NULL, newpath, sizeof (newpath)); if (size <= 0) { if (errno == ENOENT) { - gf_log (this->name, GF_LOG_DEBUG, "%s: %s", newpath, + gf_msg_debug (this->name, 0, "%s: %s", newpath, strerror (ENOENT)); stale = _gf_true; } @@ -1183,12 +1219,12 @@ del_stale_dir_handle (xlator_t *this, uuid_t gfid) size = sys_lgetxattr (newpath, GFID_XATTR_KEY, gfid_curr, 16); if (size < 0 && errno == ENOENT) { - gf_log (this->name, GF_LOG_DEBUG, "%s: %s", newpath, + gf_msg_debug (this->name, 0, "%s: %s", newpath, strerror (ENOENT)); stale = _gf_true; } else if (size == 16 && gf_uuid_compare (gfid, gfid_curr)) { - gf_log (this->name, GF_LOG_DEBUG, "%s: mismatching gfid: %s, " - "at %s", hpath, uuid_utoa (gfid_curr), newpath); + gf_msg_debug (this->name, 0, "%s: mismatching gfid: %s, " + "at %s", hpath, uuid_utoa (gfid_curr), newpath); stale = _gf_true; } @@ -1196,11 +1232,11 @@ out: if (stale) { size = sys_unlink (hpath); if (size < 0 && errno != ENOENT) - gf_log (this->name, GF_LOG_ERROR, "%s: Failed to " - "remove handle to %s (%s)", hpath, newpath, - strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_STALE_HANDLE_REMOVE_FAILED, "%s: Failed" + "to remove handle to %s", hpath, newpath); } else if (size == 16) { - gf_log (this->name, GF_LOG_DEBUG, "%s: Fresh handle for " + gf_msg_debug (this->name, 0, "%s: Fresh handle for " "%s with gfid %s", hpath, newpath, uuid_utoa (gfid_curr)); } @@ -1223,7 +1259,7 @@ janitor_walker (const char *fpath, const struct stat *sb, case S_IFCHR: case S_IFIFO: case S_IFSOCK: - gf_log (THIS->name, GF_LOG_TRACE, + gf_msg_trace (THIS->name, 0, "unlinking %s", fpath); unlink (fpath); if (stbuf.ia_nlink == 1) @@ -1232,7 +1268,7 @@ janitor_walker (const char *fpath, const struct stat *sb, case S_IFDIR: if (ftwbuf->level) { /* don't remove top level dir */ - gf_log (THIS->name, GF_LOG_TRACE, + gf_msg_debug (THIS->name, 0, "removing directory %s", fpath); rmdir (fpath); @@ -1297,8 +1333,9 @@ posix_janitor_thread_proc (void *data) while (1) { time (&now); if ((now - priv->last_landfill_check) > priv->janitor_sleep_duration) { - gf_log (this->name, GF_LOG_TRACE, - "janitor cleaning out %s", priv->trash_path); + gf_msg_trace (this->name, 0, + "janitor cleaning out %s", + priv->trash_path); nftw (priv->trash_path, janitor_walker, @@ -1311,12 +1348,12 @@ posix_janitor_thread_proc (void *data) pfd = janitor_get_next_fd (this); if (pfd) { if (pfd->dir == NULL) { - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "janitor: closing file fd=%d", pfd->fd); close (pfd->fd); } else { - gf_log (this->name, GF_LOG_TRACE, - "janitor: closing dir fd=%p", pfd->dir); + gf_msg_debug (this->name, 0, "janitor: closing" + " dir fd=%p", pfd->dir); closedir (pfd->dir); } @@ -1343,9 +1380,9 @@ posix_spawn_janitor_thread (xlator_t *this) posix_janitor_thread_proc, this); if (ret < 0) { - gf_log (this->name, GF_LOG_ERROR, - "spawning janitor thread failed: %s", - strerror (errno)); + gf_msg (this->name, GF_LOG_ERROR, errno, + P_MSG_THREAD_FAILED, "spawning janitor " + "thread failed"); goto unlock; } @@ -1537,7 +1574,8 @@ __posix_fd_ctx_get (fd_t *fd, xlator_t *this, struct posix_fd **pfd_p) MAKE_HANDLE_PATH (real_path, this, fd->inode->gfid, NULL); if (!real_path) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + P_MSG_HANDLE_PATH_CREATE_FAILED, "Failed to create handle path (%s)", uuid_utoa (fd->inode->gfid)); ret = -1; @@ -1633,16 +1671,16 @@ posix_fs_health_check (xlator_t *this) fd = open (file_path, O_CREAT|O_RDWR, 0644); if (fd == -1) { - gf_log (this->name, GF_LOG_WARNING, - "open() on %s returned: %s", file_path, - strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_HEALTHCHECK_FAILED, + "open() on %s returned", file_path); goto out; } nofbytes = write (fd, timestamp, timelen); if (nofbytes != timelen) { - gf_log (this->name, GF_LOG_WARNING, - "write() on %s returned: %s", file_path, - strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_HEALTHCHECK_FAILED, + "write() on %s returned", file_path); goto out; } /* Seek the offset to the beginning of the file, so that the offset for @@ -1650,9 +1688,9 @@ posix_fs_health_check (xlator_t *this) lseek(fd, 0, SEEK_SET); nofbytes = read (fd, buff, timelen); if (nofbytes == -1) { - gf_log (this->name, GF_LOG_WARNING, - "read() on %s returned: %s", file_path, - strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_HEALTHCHECK_FAILED, + "read() on %s returned", file_path); goto out; } ret = 0; @@ -1680,7 +1718,7 @@ posix_health_check_thread_proc (void *data) if (interval == 0) goto out; - gf_log (this->name, GF_LOG_DEBUG, "health-check thread started, " + gf_msg_debug (this->name, 0, "health-check thread started, " "interval = %d seconds", interval); while (1) { @@ -1697,9 +1735,10 @@ posix_health_check_thread_proc (void *data) ret = posix_fs_health_check (this); if (ret < 0) { - gf_log (this->name, GF_LOG_WARNING, - "health_check on %s returned: %s", - priv->base_path, strerror (errno)); + gf_msg (this->name, GF_LOG_WARNING, errno, + P_MSG_HEALTHCHECK_FAILED, + "health_check on %s returned", + priv->base_path); goto abort; } @@ -1707,7 +1746,7 @@ posix_health_check_thread_proc (void *data) } out: - gf_log (this->name, GF_LOG_DEBUG, "health-check thread exiting"); + gf_msg_debug (this->name, 0, "health-check thread exiting"); LOCK (&priv->lock); { @@ -1719,18 +1758,21 @@ out: abort: /* health-check failed */ - gf_log (this->name, GF_LOG_EMERG, "health-check failed, going down"); + gf_msg (this->name, GF_LOG_EMERG, 0, P_MSG_HEALTHCHECK_FAILED, + "health-check failed, going down"); xlator_notify (this->parents->xlator, GF_EVENT_CHILD_DOWN, this); ret = sleep (30); if (ret == 0) { - gf_log (this->name, GF_LOG_EMERG, "still alive! -> SIGTERM"); + gf_msg (this->name, GF_LOG_EMERG, 0, P_MSG_HEALTHCHECK_FAILED, + "still alive! -> SIGTERM"); kill (getpid(), SIGTERM); } ret = sleep (30); if (ret == 0) { - gf_log (this->name, GF_LOG_EMERG, "still alive! -> SIGKILL"); + gf_msg (this->name, GF_LOG_EMERG, 0, P_MSG_HEALTHCHECK_FAILED, + "still alive! -> SIGKILL"); kill (getpid(), SIGKILL); } @@ -1762,9 +1804,9 @@ posix_spawn_health_check_thread (xlator_t *xl) if (ret < 0) { priv->health_check_interval = 0; priv->health_check_active = _gf_false; - gf_log (xl->name, GF_LOG_ERROR, - "unable to setup health-check thread: %s", - strerror (errno)); + gf_msg (xl->name, GF_LOG_ERROR, errno, + P_MSG_HEALTHCHECK_FAILED, + "unable to setup health-check thread"); goto unlock; } @@ -1810,7 +1852,8 @@ posix_fsyncer_process (xlator_t *this, call_stub_t *stub, gf_boolean_t do_fsync) ret = posix_fd_ctx_get (stub->args.fd, this, &pfd); if (ret < 0) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, EINVAL, + P_MSG_GET_FDCTX_FAILED, "could not get fdctx for fd(%s)", uuid_utoa (stub->args.fd->inode->gfid)); call_unwind_error (stub, -1, EINVAL); @@ -1827,7 +1870,7 @@ posix_fsyncer_process (xlator_t *this, call_stub_t *stub, gf_boolean_t do_fsync) } if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_FSTAT_FAILED, "could not fstat fd(%s)", uuid_utoa (stub->args.fd->inode->gfid)); call_unwind_error (stub, -1, errno); @@ -1887,7 +1930,7 @@ posix_fsyncer (void *d) usleep (priv->batch_fsync_delay_usec); - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "picked %d fsyncs", count); switch (priv->batch_fsync_mode) { |