[jira] [Updated] (OAK-571) Limit usage of headRevId in sync collection to non-branches

2013-01-22 Thread Mete Atamel (JIRA)

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

Mete Atamel updated OAK-571:


Attachment: OAK-571-2.patch

This second patch seems to work better. concurrentNonConflictingMerges still 
fails but this time it does not fail with nonexisting commit but rather fails 
with a conflicting commit.

 Limit usage of headRevId in sync collection to non-branches
 ---

 Key: OAK-571
 URL: https://issues.apache.org/jira/browse/OAK-571
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: mongomk
Reporter: Marcel Reutegger
 Attachments: OAK-571-2.patch, OAK-571.patch


 Currently the head revision in the sync collection is also updated for branch 
 commits. This makes some commands more complicated (e.g. 
 FetchHeadRevisionIdAction must check for branch commits). With the current 
 implementation it may also happen that a commit is exposed, which is later 
 marked as failed. This happens when the head revision is set to a higher 
 value (because of a branch commit) than the current head revision of the 
 trunk. Now it may happen that a commit with revision R to trunk with 
 head-of-trunk  R  head-of-branch is exposed as valid commit for some time 
 but may later marked failed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (OAK-571) Limit usage of headRevId in sync collection to non-branches

2013-01-22 Thread Marcel Reutegger (JIRA)

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

Marcel Reutegger updated OAK-571:
-

Attachment: OAK-571-3.patch

Attached patch simply returns all commits fetched from MongoDB. oak-mongomk 
tests succeed.

I haven't seen any concurrentNonConflictingMerges() failures even after running 
it multiple times.

 Limit usage of headRevId in sync collection to non-branches
 ---

 Key: OAK-571
 URL: https://issues.apache.org/jira/browse/OAK-571
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: mongomk
Reporter: Marcel Reutegger
 Attachments: OAK-571-2.patch, OAK-571-3.patch, OAK-571.patch


 Currently the head revision in the sync collection is also updated for branch 
 commits. This makes some commands more complicated (e.g. 
 FetchHeadRevisionIdAction must check for branch commits). With the current 
 implementation it may also happen that a commit is exposed, which is later 
 marked as failed. This happens when the head revision is set to a higher 
 value (because of a branch commit) than the current head revision of the 
 trunk. Now it may happen that a commit with revision R to trunk with 
 head-of-trunk  R  head-of-branch is exposed as valid commit for some time 
 but may later marked failed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (OAK-571) Limit usage of headRevId in sync collection to non-branches

2013-01-22 Thread Mete Atamel (JIRA)

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

Mete Atamel updated OAK-571:


Attachment: OAK-571-4.patch

Minor tweak to the previous patch to include CommitCommand in the fix.

 Limit usage of headRevId in sync collection to non-branches
 ---

 Key: OAK-571
 URL: https://issues.apache.org/jira/browse/OAK-571
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: mongomk
Reporter: Marcel Reutegger
 Attachments: OAK-571-2.patch, OAK-571-3.patch, OAK-571-4.patch, 
 OAK-571.patch


 Currently the head revision in the sync collection is also updated for branch 
 commits. This makes some commands more complicated (e.g. 
 FetchHeadRevisionIdAction must check for branch commits). With the current 
 implementation it may also happen that a commit is exposed, which is later 
 marked as failed. This happens when the head revision is set to a higher 
 value (because of a branch commit) than the current head revision of the 
 trunk. Now it may happen that a commit with revision R to trunk with 
 head-of-trunk  R  head-of-branch is exposed as valid commit for some time 
 but may later marked failed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (OAK-571) Limit usage of headRevId in sync collection to non-branches

2013-01-21 Thread Mete Atamel (JIRA)

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

Mete Atamel updated OAK-571:


Attachment: OAK-571.patch

Attached is a partial solution. All the tests except 
MongoMKBranchMergeTest#concurrentNonConflictingMerges pass. That test fails 
because CommitCommandNew does not handle concurrent conflicting commit 
detection correctly anymore with the changes.

 Limit usage of headRevId in sync collection to non-branches
 ---

 Key: OAK-571
 URL: https://issues.apache.org/jira/browse/OAK-571
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: mongomk
Reporter: Marcel Reutegger
 Attachments: OAK-571.patch


 Currently the head revision in the sync collection is also updated for branch 
 commits. This makes some commands more complicated (e.g. 
 FetchHeadRevisionIdAction must check for branch commits). With the current 
 implementation it may also happen that a commit is exposed, which is later 
 marked as failed. This happens when the head revision is set to a higher 
 value (because of a branch commit) than the current head revision of the 
 trunk. Now it may happen that a commit with revision R to trunk with 
 head-of-trunk  R  head-of-branch is exposed as valid commit for some time 
 but may later marked failed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira