[OAK-1198] Retry InMemory merge

• Type: Improvement
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Fix Version/s: 0.12
• Component/s: core
• Assignee: Marcel Reutegger
• Reporter: Marcel Reutegger
• Created: 18/Nov/13 15:35
• Updated: 28/Nov/13 14:34
• Resolved: 19/Nov/13 09:25

Description

AbstractNodeStoreBranch should retry an InMemory.merge() when the operation fails to persist the changes. Even though KernelNodeStoreBranch acquires a merge lock and therefore serializes merges in one Oak instance, it may still happen that other Oak instances concurrently persist changes with conflicting editor changes. In this case a retry, including a rebase may not show these conflicts anymore.

One specific example is OAK-1187, when multiple Oak instances concurrently try to create /jcr:system/rep:permissionStore/default/everyone.

Issue Links

• blocks: OAK-1187 Parallel execution of various access control related benchmarks fail on MongoMK