diff options
| author | Kotresh HR <khiremat@redhat.com> | 2016-08-01 16:59:33 +0530 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2016-08-09 00:27:12 -0700 |
| commit | 949472d7561d3bfd67d8204e433a25dbc8a596cc (patch) | |
| tree | d73d7439a4214c1fc7bbf01743e59a6aeaa6af18 /xlators/features/changelog/lib | |
| parent | f5fbf46d82e4ea5325e89459c5ad9f753f1ca66b (diff) | |
features/libgfchangelog: Log failure in gf_histroy_changelog
Add error logs if gf_history_changelog fails. If requested
changelog range is not available, log the error and exit
instead of continuing the loop and exiting in readdir
without logging. Also fixed the duplicate MSGID number in
'changelog-lib-messages.h'
Change-Id: Icd71b89ae23b48a71380657ba5649029c32fabfd
BUG: 1362151
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/15064
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Diffstat (limited to 'xlators/features/changelog/lib')
| -rw-r--r-- | xlators/features/changelog/lib/src/changelog-lib-messages.h | 11 | ||||
| -rw-r--r-- | xlators/features/changelog/lib/src/gf-history-changelog.c | 17 |
2 files changed, 24 insertions, 4 deletions
diff --git a/xlators/features/changelog/lib/src/changelog-lib-messages.h b/xlators/features/changelog/lib/src/changelog-lib-messages.h index 976c67f61a9..a6209af71ee 100644 --- a/xlators/features/changelog/lib/src/changelog-lib-messages.h +++ b/xlators/features/changelog/lib/src/changelog-lib-messages.h @@ -45,7 +45,7 @@ */ #define GLFS_COMP_BASE_CHANGELOG_LIB GLFS_MSGID_COMP_CHANGELOG_LIB -#define GLFS_NUM_MESSAGES 28 +#define GLFS_NUM_MESSAGES 32 #define GLFS_MSGID_END (GLFS_COMP_BASE_CHANGELOG_LIB + GLFS_NUM_MESSAGES + 1) #define glfs_msg_start_x GLFS_COMP_BASE_CHANGELOG_LIB,\ @@ -280,8 +280,15 @@ * @recommended action */ #define CHANGELOG_LIB_MSG_PTHREAD_JOIN_FAILED \ - (GLFS_COMP_BASE_CHANGELOG_LIB + 20) + (GLFS_COMP_BASE_CHANGELOG_LIB + 31) +/*! + * @messageid + * @diagnosis + * @recommended action +*/ +#define CHANGELOG_LIB_MSG_HIST_FAILED \ + (GLFS_COMP_BASE_CHANGELOG_LIB + 32) #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* !_CHANGELOG_MESSAGES_H_ */ diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c index 5ed50390a7c..45f2d8ba9f3 100644 --- a/xlators/features/changelog/lib/src/gf-history-changelog.c +++ b/xlators/features/changelog/lib/src/gf-history-changelog.c @@ -805,6 +805,9 @@ gf_history_changelog (char* changelog_dir, unsigned long start, ret = pthread_attr_init (&attr); if (ret != 0) { + gf_msg (this->name, GF_LOG_ERROR, errno, + CHANGELOG_LIB_MSG_PTHREAD_ERROR, + "Pthread init failed"); return -1; } @@ -828,6 +831,10 @@ gf_history_changelog (char* changelog_dir, unsigned long start, /* basic sanity check */ if (start > end || n_parallel <= 0) { + gf_msg (this->name, GF_LOG_ERROR, errno, + CHANGELOG_LIB_MSG_HIST_FAILED, "Sanity check failed. " + "START - %lu END - %lu THREAD_COUNT - %d", + start, end, n_parallel); ret = -1; goto out; } @@ -964,8 +971,14 @@ gf_history_changelog (char* changelog_dir, unsigned long start, goto out; - } /* end of range check */ - + } else {/* end of range check */ + gf_msg (this->name, GF_LOG_ERROR, errno, + CHANGELOG_LIB_MSG_HIST_FAILED, "Requested changelog " + "range is not available. START - %lu CHLOG_MIN - %lu " + "CHLOG_MAX - %lu", start, min_ts, max_ts); + ret = -2; + goto out; + } } /* end of readdir() */ if (!from || !to) |