Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync_support: stronger logging in sync_mailbox_compare_update #4751

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sync_support: stronger logging in sync_mailbox_compare_update #4751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions imap/sync_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2466,7 +2466,7 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
struct dlist *ki;
struct sync_annot_list *mannots = NULL;
struct sync_annot_list *rannots = NULL;
int r;
int r = 0;
int i;
int has_append = 0;

Expand Down Expand Up @@ -2504,7 +2504,7 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
/* GUID mismatch is an error straight away, it only ever happens if we
* had a split brain - and it will take a full sync to sort out the mess */
if (!message_guid_equal(&mrecord.guid, &rrecord->guid)) {
xsyslog(LOG_ERR, "SYNCNOTICE: guid mismatch",
xsyslog(LOG_ERR, "SYNCERROR: guid mismatch",
"mailbox=<%s> uid=<%u>",
mailbox_name(mailbox), mrecord.uid);
r = IMAP_SYNC_CHECKSUM;
Expand All @@ -2520,7 +2520,7 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
mailbox_name(mailbox), mrecord.uid, rrecord->modseq, mrecord.modseq);
}
else {
xsyslog(LOG_ERR, "SYNCNOTICE: higher modseq on replica",
xsyslog(LOG_ERR, "SYNCERROR: higher modseq on replica",
"mailbox=<%s> uid=<%u>"
" replicamodseq=<" MODSEQ_FMT ">"
" mastermodseq=<" MODSEQ_FMT ">",
Expand All @@ -2535,7 +2535,7 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
* that's bad */
if (!(mrecord.internal_flags & FLAG_INTERNAL_EXPUNGED) &&
(rrecord->internal_flags & FLAG_INTERNAL_EXPUNGED)) {
xsyslog(LOG_ERR, "SYNCNOTICE: expunged on replica",
xsyslog(LOG_ERR, "SYNCERROR: expunged on replica",
"mailbox=<%s> uid=<%u>",
mailbox_name(mailbox), mrecord.uid);
r = IMAP_SYNC_CHECKSUM;
Expand Down Expand Up @@ -2566,16 +2566,22 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
r = read_annotations(mailbox, &copy, &rannots, rrecord->modseq,
/*XXX ANNOTATE_TOMBSTONES*/0);
if (r) {
syslog(LOG_ERR, "Failed to read local annotations %s %u: %s",
mailbox_name(mailbox), rrecord->recno, error_message(r));
xsyslog(LOG_ERR, "SYNCERROR: failed to read local annotations",
"mailbox=<%s> recno=<%u> error=<%s>",
mailbox_name(mailbox),
rrecord->recno,
error_message(r));
goto out;
}

int hadsnoozed = 0;
r = apply_annotations(mailbox, &copy, rannots, mannots, 0, &hadsnoozed);
if (r) {
syslog(LOG_ERR, "Failed to write merged annotations %s %u: %s",
mailbox_name(mailbox), rrecord->recno, error_message(r));
xsyslog(LOG_ERR, "SYNCERROR: failed to write merged annotations"
"mailbox=<%s> recno=<%u> error=<%s>",
mailbox_name(mailbox),
rrecord->recno,
error_message(r));
goto out;
}

Expand All @@ -2596,6 +2602,11 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
else if (mrecord.uid <= mailbox->i.last_uid) {
/* Expunged, just skip it */
if (!(mrecord.internal_flags & FLAG_INTERNAL_EXPUNGED)) {
xsyslog(LOG_ERR, "SYNCERROR: not found and less than LAST_UID, bogus",
"mailbox=<%s> uid=<%u> last_uid=<%u>",
mailbox_name(mailbox),
mrecord.uid,
mailbox->i.last_uid);
r = IMAP_SYNC_CHECKSUM;
goto out;
}
Expand All @@ -2622,8 +2633,6 @@ static int sync_mailbox_compare_update(struct mailbox *mailbox,
if (has_append)
sync_log_append(mailbox_name(mailbox));

r = 0;

out:
mailbox_iter_done(&iter);
sync_annot_list_free(&mannots);
Expand Down Expand Up @@ -3011,16 +3020,18 @@ int sync_apply_mailbox(struct dlist *kin,
if (!r) r = apply_annotations(mailbox, NULL, rannots, mannots, 0, NULL);

if (r) {
syslog(LOG_ERR, "syncerror: annotations failed to apply to %s",
mailbox_name(mailbox));
xsyslog(LOG_ERR, "SYNCERROR: annotations failed to apply",
"mailbox=<%s>",
mailbox_name(mailbox));
goto done;
}

r = sync_mailbox_compare_update(mailbox, kr, 1, part_list);
if (r) {
/* SHOULD never happen */
syslog(LOG_ERR, "syncerror: mailbox compare update failed for %s: %s",
mailbox_name(mailbox), error_message(r));
xsyslog(LOG_ERR, "SYNCERROR: mailbox compare update failed",
"mailbox=<%s> error=<%s>",
mailbox_name(mailbox), error_message(r));
abort();
return r;
}
Expand Down