lib-storage: mailbox_get_status() can now fail.

It might have failed earlier also, but the errors were hidden from caller.

diff --git a/src/doveadm/doveadm-mail-mailbox-status.c b/src/doveadm/doveadm-mail-mailbox-status.c
index 4e28e7853c067ad2c96210166cc51d21bb207572..86587f250cfe60a40525c4c70e5f47fb9bcd5d1c 100644 (file)
--- a/src/doveadm/doveadm-mail-mailbox-status.c
+++ b/src/doveadm/doveadm-mail-mailbox-status.c
@@ -127,11 +127,11 @@ status_mailbox(struct status_cmd_context *ctx, const struct mailbox_info *info)
        }
 
        if (doveadm_mailbox_find_and_sync(ctx->ctx.cur_mail_user,
-                                         str_c(mailbox_name), &box) < 0) {
+                                         str_c(mailbox_name), &box) < 0 ||
+          mailbox_get_status(box, ctx->items, &status) < 0) {
                ctx->ctx.failed = TRUE;
                return;
        }
-       mailbox_get_status(box, ctx->items, &status);
        if (ctx->guid) {
                if (mailbox_get_guid(box, mailbox_guid) < 0)
                        memset(mailbox_guid, 0, sizeof(mailbox_guid));

diff --git a/src/dsync/dsync-worker-local.c b/src/dsync/dsync-worker-local.c
index b6bd0290b27fd2ad105fc196e68cd77ea4c145a6..b01f47a4ffd5825618f23a793e3d56fd94ca888a 100644 (file)
--- a/src/dsync/dsync-worker-local.c
+++ b/src/dsync/dsync-worker-local.c
@@ -510,8 +510,11 @@ local_worker_mailbox_iter_next(struct dsync_worker_mailbox_iter *_iter,
                (struct local_dsync_worker_mailbox_iter *)_iter;
        struct local_dsync_worker *worker =
                (struct local_dsync_worker *)_iter->worker;
-       enum mailbox_flags flags =
+       const enum mailbox_flags flags =
                MAILBOX_FLAG_READONLY | MAILBOX_FLAG_KEEP_RECENT;
+       const enum mailbox_status_items status_items =
+               STATUS_UIDNEXT | STATUS_UIDVALIDITY |
+               STATUS_HIGHESTMODSEQ | STATUS_CACHE_FIELDS;
        const struct mailbox_info *info;
        const char *storage_name;
        struct mailbox *box;
@@ -555,6 +558,7 @@ local_worker_mailbox_iter_next(struct dsync_worker_mailbox_iter *_iter,
 
        box = mailbox_alloc(info->ns->list, storage_name, flags);
        if (mailbox_sync(box, 0) < 0 ||
+           mailbox_get_status(box, status_items, &status) < 0 ||
            mailbox_get_guid(box, mailbox_guid) < 0) {
                struct mail_storage *storage = mailbox_get_storage(box);
 
@@ -565,9 +569,6 @@ local_worker_mailbox_iter_next(struct dsync_worker_mailbox_iter *_iter,
                return -1;
        }
 
-       mailbox_get_status(box, STATUS_UIDNEXT | STATUS_UIDVALIDITY |
-                          STATUS_HIGHESTMODSEQ | STATUS_CACHE_FIELDS, &status);
-
        change = hash_table_lookup(worker->mailbox_changes_hash, mailbox_guid);
        if (change != NULL) {
                /* it shouldn't be marked as deleted, but drop it to be sure */
@@ -935,7 +936,8 @@ iter_local_mailbox_next_expunge(struct local_dsync_worker_msg_iter *iter,
        array_clear(&iter->expunges);
        iter->expunges_set = TRUE;
 
-       mailbox_get_status(box, STATUS_UIDNEXT, &status);
+       if (mailbox_get_status(box, STATUS_UIDNEXT, &status) < 0)
+               i_unreached();
        if (prev_uid + 1 >= status.uidnext) {
                /* no expunged messages at the end of mailbox */
                return FALSE;

diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index 14d43878f86462028a80cbd839445ca628defc9d..e588647a52d6798da0cf97aade30e403ff48d4e1 100644 (file)
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -295,10 +295,14 @@ select_open(struct imap_select_context *ctx, const char *mailbox, bool readonly)
                                          mailbox_get_storage(ctx->box));
                return -1;
        }
-       mailbox_get_status(ctx->box, STATUS_MESSAGES | STATUS_RECENT |
-                          STATUS_FIRST_UNSEEN_SEQ | STATUS_UIDVALIDITY |
-                          STATUS_UIDNEXT | STATUS_KEYWORDS |
-                          STATUS_HIGHESTMODSEQ, &status);
+       if (mailbox_get_status(ctx->box, STATUS_MESSAGES | STATUS_RECENT |
+                              STATUS_FIRST_UNSEEN_SEQ | STATUS_UIDVALIDITY |
+                              STATUS_UIDNEXT | STATUS_KEYWORDS |
+                              STATUS_HIGHESTMODSEQ, &status) < 0) {
+               client_send_storage_error(ctx->cmd,
+                                         mailbox_get_storage(ctx->box));
+               return -1;
+       }
 
        client->mailbox = ctx->box;
        client->select_counter++;

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 7305d295aaaccbc436bd3476fc7936b78866280c..954b5026756c60dda507f20f6b244efa0c1c8d5d 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -926,8 +926,9 @@ void client_enable(struct client *client, enum mailbox_feature features)
        if ((features & MAILBOX_FEATURE_CONDSTORE) != 0) {
                /* CONDSTORE being enabled while mailbox is selected.
                   Notify client of the latest HIGHESTMODSEQ. */
-               mailbox_get_status(client->mailbox,
-                                  STATUS_HIGHESTMODSEQ, &status);
+               if (mailbox_get_status(client->mailbox,
+                                      STATUS_HIGHESTMODSEQ, &status) < 0)
+                       i_unreached();
                client_send_line(client, t_strdup_printf(
                        "* OK [HIGHESTMODSEQ %llu] Highest",
                        (unsigned long long)status.highest_modseq));

diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index df6cb5429424427f28202c1281423b5f553f3d57..b0c63bdb63ac9e0f0c4db0d79e06082c2062455c 100644 (file)
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -82,13 +82,9 @@ int imap_status_get(struct client_command_context *cmd,
        if ((items->mailbox_items & STATUS_HIGHESTMODSEQ) != 0)
                client_enable(client, MAILBOX_FEATURE_CONDSTORE);
 
-       ret = box == client->mailbox ? 0 : mailbox_sync(box, 0);
-       if (ret == 0) {
-               mailbox_get_status(box, items->mailbox_items,
-                                  &result_r->status);
-               if (items->guid)
-                       ret = mailbox_get_guid(box, result_r->mailbox_guid);
-       }
+       ret = mailbox_get_status(box, items->mailbox_items, &result_r->status);
+       if (items->guid && ret == 0)
+               ret = mailbox_get_guid(box, result_r->mailbox_guid);
 
        if (ret < 0) {
                struct mail_storage *storage = mailbox_get_storage(box);

diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index f5ae20547974a5ba46b8677fdc09ec5b4cd577e3..17a90916332b06dd11a5e78ae8fa627c34ad30f5 100644 (file)
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -210,6 +210,9 @@ imap_sync_send_highestmodseq(struct imap_sync_context *ctx,
 int imap_sync_deinit(struct imap_sync_context *ctx,
                     struct client_command_context *sync_cmd)
 {
+       const enum mailbox_status_items status_items =
+               STATUS_UIDVALIDITY | STATUS_MESSAGES | STATUS_RECENT |
+               STATUS_HIGHESTMODSEQ;
        struct client *client = ctx->client;
        struct mailbox_status status;
        struct mailbox_sync_status sync_status;
@@ -220,15 +223,13 @@ int imap_sync_deinit(struct imap_sync_context *ctx,
                array_free(&ctx->expunges);
 
        if (mailbox_sync_deinit(&ctx->sync_ctx, &sync_status) < 0 ||
+           mailbox_get_status(ctx->box, status_items, &status) < 0 ||
            ctx->failed) {
                mailbox_transaction_rollback(&ctx->t);
                array_free(&ctx->tmp_keywords);
                i_free(ctx);
                return -1;
        }
-       mailbox_get_status(ctx->box, STATUS_UIDVALIDITY |
-                          STATUS_MESSAGES | STATUS_RECENT |
-                          STATUS_HIGHESTMODSEQ, &status);
 
        ret = mailbox_transaction_commit(&ctx->t);
 

diff --git a/src/lib-storage/index/index-status.c b/src/lib-storage/index/index-status.c
index 9ad25ff8bbe60c3de0d7df29329051de0db972cb..ac219a5f5e1059cd023456278e977bccee3c9579 100644 (file)
--- a/src/lib-storage/index/index-status.c
+++ b/src/lib-storage/index/index-status.c
@@ -29,7 +29,7 @@ index_storage_get_status_cache_fields(struct mailbox *box,
        status_r->cache_fields = cache_fields;
 }
 
-static void
+static int
 index_storage_virtual_size_add_new(struct mailbox *box,
                                   struct index_vsize_header *vsize_hdr)
 {
@@ -94,10 +94,10 @@ index_storage_virtual_size_add_new(struct mailbox *box,
        mail_index_update_header_ext(trans->itrans, ibox->vsize_hdr_ext_id,
                                     0, vsize_hdr, sizeof(*vsize_hdr));
        (void)mailbox_transaction_commit(&trans);
-
+       return ret;
 }
 
-static void
+static int
 index_storage_get_status_virtual_size(struct mailbox *box,
                                      struct mailbox_status *status_r)
 {
@@ -105,6 +105,7 @@ index_storage_get_status_virtual_size(struct mailbox *box,
        struct index_vsize_header vsize_hdr;
        const void *data;
        size_t size;
+       int ret;
 
        mail_index_get_header_ext(box->view, ibox->vsize_hdr_ext_id,
                                  &data, &size);
@@ -123,7 +124,7 @@ index_storage_get_status_virtual_size(struct mailbox *box,
            vsize_hdr.message_count == status_r->messages) {
                /* up to date */
                status_r->virtual_size = vsize_hdr.vsize;
-               return;
+               return 0;
        }
        if (vsize_hdr.highest_uid >= status_r->uidnext) {
                mail_storage_set_critical(box->storage,
@@ -131,20 +132,27 @@ index_storage_get_status_virtual_size(struct mailbox *box,
                        vsize_hdr.highest_uid, status_r->uidnext);
                memset(&vsize_hdr, 0, sizeof(vsize_hdr));
        }
-       index_storage_virtual_size_add_new(box, &vsize_hdr);
+       ret = index_storage_virtual_size_add_new(box, &vsize_hdr);
        status_r->virtual_size = vsize_hdr.vsize;
+       return ret;
 }
 
-void index_storage_get_status(struct mailbox *box,
-                             enum mailbox_status_items items,
-                             struct mailbox_status *status_r)
+int index_storage_get_status(struct mailbox *box,
+                            enum mailbox_status_items items,
+                            struct mailbox_status *status_r)
 {
        const struct mail_index_header *hdr;
-
-       i_assert(box->opened);
+       int ret = 0;
 
        memset(status_r, 0, sizeof(struct mailbox_status));
 
+       if (!box->opened) {
+               if (mailbox_open(box) < 0)
+                       return -1;
+               if (mailbox_sync(box, 0) < 0)
+                       return -1;
+       }
+
        /* we can get most of the status items without any trouble */
        hdr = mail_index_get_header(box->view);
        status_r->messages = hdr->messages_count;
@@ -174,6 +182,9 @@ void index_storage_get_status(struct mailbox *box,
                status_r->keywords = mail_index_get_keywords(box->index);
        if ((items & STATUS_CACHE_FIELDS) != 0)
                index_storage_get_status_cache_fields(box, status_r);
-       if ((items & STATUS_VIRTUAL_SIZE) != 0)
-               index_storage_get_status_virtual_size(box, status_r);
+       if ((items & STATUS_VIRTUAL_SIZE) != 0) {
+               if (index_storage_get_status_virtual_size(box, status_r) < 0)
+                       ret = -1;
+       }
+       return ret;
 }

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index e55d35166100b5f77e308429da697c696cdde1eb..d64311b5537af15cad884d652926bae4b95e150c 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -105,9 +105,9 @@ int index_mailbox_sync_deinit(struct mailbox_sync_context *ctx,
 
 int index_storage_sync(struct mailbox *box, enum mailbox_sync_flags flags);
 enum mailbox_sync_type index_sync_type_convert(enum mail_index_sync_type type);
-void index_storage_get_status(struct mailbox *box,
-                             enum mailbox_status_items items,
-                             struct mailbox_status *status_r);
+int index_storage_get_status(struct mailbox *box,
+                            enum mailbox_status_items items,
+                            struct mailbox_status *status_r);
 
 struct mail_search_context *
 index_storage_search_init(struct mailbox_transaction_context *t,

diff --git a/src/lib-storage/list/index-mailbox-list-sync.c b/src/lib-storage/list/index-mailbox-list-sync.c
index fea8915bd50a3ad38564a79e733485806e448e5e..15d7a94c997f61dc8301d2d25c3b2db179eea696 100644 (file)
--- a/src/lib-storage/list/index-mailbox-list-sync.c
+++ b/src/lib-storage/list/index-mailbox-list-sync.c
@@ -159,7 +159,7 @@ index_list_get_cached_status(struct mailbox *box, struct mailbox_status *status)
        return ret;
 }
 
-static void
+static int
 index_list_get_status(struct mailbox *box, enum mailbox_status_items items,
                      struct mailbox_status *status)
 {
@@ -167,11 +167,11 @@ index_list_get_status(struct mailbox *box, enum mailbox_status_items items,
 
        if ((items & ~CACHED_STATUS_ITEMS) == 0) {
                if (index_list_get_cached_status(box, status) > 0)
-                       return;
+                       return 0;
                /* nonsynced / error, fallback to doing it the slow way */
        }
 
-       ibox->module_ctx.super.get_status(box, items, status);
+       return ibox->module_ctx.super.get_status(box, items, status);
 }
 
 static int index_list_lookup_or_create(struct index_mailbox_list *ilist,

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 26e1f98b3bfd04c82a8b0abf066a757d60babfe5..38488c46bb1937d04cff6d8a194c08fd70ba29cf 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -114,8 +114,8 @@ struct mailbox_vfuncs {
        int (*rename)(struct mailbox *src, struct mailbox *dest,
                      bool rename_children);
 
-       void (*get_status)(struct mailbox *box, enum mailbox_status_items items,
-                          struct mailbox_status *status_r);
+       int (*get_status)(struct mailbox *box, enum mailbox_status_items items,
+                         struct mailbox_status *status_r);
        int (*get_guid)(struct mailbox *box, uint8_t guid[MAIL_GUID_128_SIZE]);
 
        /* Lookup sync extension record and figure out if it mailbox has

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 052fd7bdf718d9f8bf99d3be99d8cbce98f21dbb..f8f192f2fc3d9b5a3ee6bbe87554c9ce3dfcfa62 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -904,11 +904,11 @@ bool mailbox_backends_equal(const struct mailbox *box1,
        return ns1 == ns2;
 }
 
-void mailbox_get_status(struct mailbox *box,
-                       enum mailbox_status_items items,
-                       struct mailbox_status *status_r)
+int mailbox_get_status(struct mailbox *box,
+                      enum mailbox_status_items items,
+                      struct mailbox_status *status_r)
 {
-       box->v.get_status(box, items, status_r);
+       return box->v.get_status(box, items, status_r);
 }
 
 int mailbox_get_guid(struct mailbox *box, uint8_t guid[MAIL_GUID_128_SIZE])

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index baafbe41ee1a3453dd1ff58a06bd8ac4019aebee..f5bcb70e27e44c770da9fc42dce7d67d0e3c380a 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -394,8 +394,8 @@ bool mailbox_backends_equal(const struct mailbox *box1,
 bool mailbox_is_inconsistent(struct mailbox *box);
 
 /* Gets the mailbox status information. */
-void mailbox_get_status(struct mailbox *box, enum mailbox_status_items items,
-                       struct mailbox_status *status_r);
+int mailbox_get_status(struct mailbox *box, enum mailbox_status_items items,
+                      struct mailbox_status *status_r);
 /* Get mailbox GUID, creating it if necessary. */
 int mailbox_get_guid(struct mailbox *box, uint8_t guid[MAIL_GUID_128_SIZE]);
 /* Returns a mask of flags that are private to user in this mailbox

diff --git a/src/lib-storage/test-mailbox.c b/src/lib-storage/test-mailbox.c
index 23b0627401a13a4d7c94d2254e2726e64be0ff22..9572c396706a844038a7408f6c8a47973818a09d 100644 (file)
--- a/src/lib-storage/test-mailbox.c
+++ b/src/lib-storage/test-mailbox.c
@@ -68,13 +68,14 @@ static int test_mailbox_rename(struct mailbox *src,
        return -1;
 }
 
-static void test_mailbox_get_status(struct mailbox *box ATTR_UNUSED,
-                                   enum mailbox_status_items items ATTR_UNUSED,
-                                   struct mailbox_status *status_r)
+static int test_mailbox_get_status(struct mailbox *box ATTR_UNUSED,
+                                  enum mailbox_status_items items ATTR_UNUSED,
+                                  struct mailbox_status *status_r)
 {
        memset(status_r, 0, sizeof(*status_r));
        status_r->uidvalidity = TEST_UID_VALIDITY;
        status_r->uidnext = 1;
+       return 0;
 }
 
 static struct mailbox_sync_context *