From 26fe1e277c3c45258de2805a4794319b11a77621 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 10 Aug 2020 20:18:48 +0300 Subject: [PATCH] lib-index: Improve debug logging --- src/lib-index/mail-index-map-read.c | 3 ++- src/lib-index/mail-index-write.c | 4 ++-- src/lib-index/mail-transaction-log.c | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib-index/mail-index-map-read.c b/src/lib-index/mail-index-map-read.c index 7286448c3c..c39eb3bd53 100644 --- a/src/lib-index/mail-index-map-read.c +++ b/src/lib-index/mail-index-map-read.c @@ -401,7 +401,8 @@ mail_index_map_latest_file(struct mail_index *index, const char **reason_r) mail_index_unmap(&index->map); index->map = new_map; - *reason_r = "Index mapped"; + *reason_r = t_strdup_printf("Index mapped (file_seq=%u)", + index->map->hdr.log_file_seq); return 1; } diff --git a/src/lib-index/mail-index-write.c b/src/lib-index/mail-index-write.c index 6d2054b06d..634e011405 100644 --- a/src/lib-index/mail-index-write.c +++ b/src/lib-index/mail-index-write.c @@ -200,8 +200,8 @@ void mail_index_write(struct mail_index *index, bool want_rotate, return; } event_set_name(index->event, "mail_index_recreated"); - e_debug(index->event, "Recreated %s because: %s", - index->filepath, reason); + e_debug(index->event, "Recreated %s (file_seq=%u) because: %s", + index->filepath, hdr->log_file_seq, reason); } index->last_read_log_file_seq = hdr->log_file_seq; diff --git a/src/lib-index/mail-transaction-log.c b/src/lib-index/mail-transaction-log.c index 7a0b6810e1..1cb2fdd95c 100644 --- a/src/lib-index/mail-transaction-log.c +++ b/src/lib-index/mail-transaction-log.c @@ -330,6 +330,9 @@ int mail_transaction_log_rotate(struct mail_transaction_log *log, bool reset) old_head = log->head; mail_transaction_log_set_head(log, file); + e_debug(log->index->event, "Rotated transaction log %s (seq=%u, reset=%s)", + file->filepath, file->hdr.file_seq, reset ? "yes" : "no"); + /* the newly created log file is already locked */ mail_transaction_log_file_unlock(old_head, !log->index->log_sync_locked ? "rotating" : @@ -385,6 +388,8 @@ mail_transaction_log_refresh(struct mail_transaction_log *log, bool nfs_flush, file = mail_transaction_log_file_alloc(log, log->filepath); if (mail_transaction_log_file_open(file, reason_r) <= 0) { + *reason_r = t_strdup_printf( + "Failed to refresh main transaction log: %s", *reason_r); mail_transaction_log_file_free(&file); return -1; } @@ -483,6 +488,8 @@ int mail_transaction_log_find_file(struct mail_transaction_log *log, /* see if we have it in log.2 file */ file = mail_transaction_log_file_alloc(log, log->filepath2); if ((ret = mail_transaction_log_file_open(file, reason_r)) <= 0) { + *reason_r = t_strdup_printf( + "Not found from .log.2: %s", *reason_r); mail_transaction_log_file_free(&file); return ret; } -- 2.47.3