Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(tee): fix race condition in batch locking #3342

Merged
merged 10 commits into from
Dec 3, 2024
Merged

fix(tee): fix race condition in batch locking #3342

merged 10 commits into from
Dec 3, 2024

Commits on Nov 29, 2024

  1. fix(tee): fix race condition in batch locking 

    After [scaling][1] [zksync-tee-prover][2] to two instances/replicas on
Azure for azure-stage2, azure-testnet2, and azure-mainnet2, we started
experiencing [duplicated proving for some batches][3]. While this is not
an erroneous situation, it is wasteful from a resource perspective. This
was due to a race condition in batch locking. This PR fixes the issue by
adding atomic batch locking.

[1]: https://github.com/matter-labs/gitops-kubernetes/pull/7033/files
[2]: https://github.com/matter-labs/zksync-era/blob/aaca32b6ab411d5cdc1234c20af8b5c1092195d7/core/bin/zksync_tee_prover/src/main.rs
[3]: https://grafana.matterlabs.dev/goto/M1I_Bq7HR?orgId=1
    @pbeza
    pbeza committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    7d96c1c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into tee/fix/atomic-batch-… 

    …locking
    @pbeza
    pbeza committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    17977dc View commit details
    Browse the repository at this point in the history

  3. Addressed review comments

    @pbeza
    pbeza committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    464b5d4 View commit details
    Browse the repository at this point in the history

  4. fixup! Addressed review comments

    @pbeza
    pbeza committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    574896b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into tee/fix/atomic-batch-… 

    …locking
    @pbeza
    pbeza committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    66a9154 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2024

  1. Merge remote-tracking branch 'origin/main' into tee/fix/atomic-batch-… 

    …locking
    @pbeza
    pbeza committed Dec 3, 2024
    Configuration menu
    Copy the full SHA
    bef72a4 View commit details
    Browse the repository at this point in the history

  2. Address Alex's code review comments

    @pbeza
    pbeza committed Dec 3, 2024
    Configuration menu
    Copy the full SHA
    6796543 View commit details
    Browse the repository at this point in the history

  3. fixup! Address Alex's code review comments

    @pbeza
    pbeza committed Dec 3, 2024
    Configuration menu
    Copy the full SHA
    ecd8c33 View commit details
    Browse the repository at this point in the history

  4. Address Harald's code review comments

    @pbeza
    pbeza committed Dec 3, 2024
    Configuration menu
    Copy the full SHA
    a1f99ab View commit details
    Browse the repository at this point in the history

  5. Revert "Address Harald's code review comments" 

    This reverts commit a1f99ab.
    @pbeza
    pbeza committed Dec 3, 2024
    Configuration menu
    Copy the full SHA
    de8de11 View commit details
    Browse the repository at this point in the history