[jira] [Closed] (OAK-6074) Simplify merge logic in LockBasedScheduler

["Davide Giannella (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/OAK-6074?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Davide Giannella closed OAK-6074.
---------------------------------

Bulk close for 1.7.3

> Simplify merge logic in LockBasedScheduler
> ------------------------------------------
>
>                 Key: OAK-6074
>                 URL: https://issues.apache.org/jira/browse/OAK-6074
>             Project: Jackrabbit Oak
>          Issue Type: Task
>          Components: segment-tar
>            Reporter: Andrei Dulceanu
>            Assignee: Andrei Dulceanu
>            Priority: Minor
>             Fix For: 1.8, 1.7.3
>
>         Attachments: OAK-6074-02.patch, OAK-6074.patch
>
>
> The current logic for executing a commit in {{LockBasedScheduler}} is unnecessarily intricate, containing separate strategies for optimistic and pessimistic merges. While these would have made sense in a hierarchical, multi-journal approach, when using a single journal file we always end up on the optimistic merge branch, since a commit semaphore is acquired before attempting to merge the commit. The proposal is to remove {{LockBasedScheduler#optimisticMerge}} and {{LockBasedScheduler#pessimisticMerge}} methods, simplifying the logic inside {{LockBasedScheduler#execute}}.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)