[Akonadi] [Bug 338658] GMail, Novell Groupwise, other IMAP: "Multiple merge candidates, aborting"

[Sandro Knauß]

https://bugs.kde.org/show_bug.cgi?id=338658

--- Comment #134 from Sandro Knauß <sknauss at kde.org> ---
Git commit 8332cf8a5aa39df6fb665cdbff1a48286d5698f5 by Sandro Knauß, on behalf
of Daniel Vrátil.
Committed on 30/08/2019 at 08:48.
Pushed by knauss into branch 'Applications/18.08'.

Automatic recovery from Multiple Merge Candidates error

Summary:
Introduce a recovery codepath when Multiple Merge Candidates error
occurs during Item merging. Since clients generally do not use
merging, this really only happens during ItemSync. In such case we
quitely delete all the conflicting items from the database and reschedule
the collection sync. The next sync should then succeed and bring the
collection into a consistent state.

Note that this does not fix the Multiple Merge Candidates bug - it can
still happen (and we still don't know how), but Akonadi should now be
able to recover from it automatically without user intervention, thus
making this issue less of a PITA.

Test Plan: Successfuly auto-recovered a broken collection on my setup.

Reviewers: #kde_pim, dfaure

Reviewed By: dfaure

Subscribers: vkrause, dfaure, ngraham, asturmlechner, kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D21455

(cherry picked from commit 8f230d7d7f8a4e2b97273585374a68902b5ef6cf)

M  +3    -3    autotests/server/fakedatastore.cpp
M  +1    -1    autotests/server/fakedatastore.h
M  +67   -5    src/server/handler/akappend.cpp
M  +4    -0    src/server/handler/akappend.h
M  +18   -16   src/server/storage/datastore.cpp
M  +3    -1    src/server/storage/datastore.h

https://commits.kde.org/akonadi/8332cf8a5aa39df6fb665cdbff1a48286d5698f5

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.