Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • erp5 erp5
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 142
    • Merge requests 142
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedinexedi
  • erp5erp5
  • Merge requests
  • !1095

ERP5Type/patches/ZODBConnection: Don't duplicate code from ZODB.Connection.newTransaction

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Kirill Smelkov requested to merge kirr/erp5:y/zodb-newTxn-nodup into master Apr 03, 2020
  • Overview 10
  • Commits 1
  • Pipelines 0
  • Changes 1

Commit c663257f (Commit fix done by Julien and Leonardo) added network barrier into ZODB.Connection.newTransaction to fix issues when activity node A1 was woken up by message from another activity node A2 through SQL, but A1's ZODB view was not yet updated with changes committed by A2.

That fix prepended ping call before original newTransaction actions, but instead of tailing to original ZODB newTransaction after the ping, it copied newTransaction code from ZODB.

Today this can cause the following problems:

  1. the code that was copied is valid only for ZODB3 and ZODB4, but is not valid for ZODB5 as that place was changed by upstream:

    https://github.com/zopefoundation/ZODB/blob/5.5.1-56-gbb9bf5393/src/ZODB/Connection.py#L734-L742

  2. wendelin.core 2 relies on patching ZODB.Connection.newTransaction further to install "Connection.onResyncCallback" functionality to keep ZODB and WCFS connections in sync:

    https://lab.nexedi.com/kirr/wendelin.core/blob/25c3184d/lib/zodb.py#L264-291

    So if ERP5Type.patches is imported after wendelin.lib.zodb, the functionality installed by wendelin.core will be lost.

-> Fix both issues by avoiding code duplication and just tailing to original ZODB newTransaction after the ping.

Note: this commit is not enough to fully support ZODB5, since ping() must also be updated.

/cc @seb, @jm, @vpelletier, @romain

Edited Apr 07, 2020 by Kirill Smelkov
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: y/zodb-newTxn-nodup
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7