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.

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

feat(Prover CLI): requeue cmd #1719

Merged
merged 49 commits into from
May 14, 2024
Merged

feat(Prover CLI): requeue cmd #1719

merged 49 commits into from
May 14, 2024

Conversation

ilitteri
Copy link
Contributor

@ilitteri ilitteri commented Apr 18, 2024

What ❔

Adds a requeue command that requeues a given batch if it's stuck. It looks at all jobs that are stuck and requeues them. A job is stuck if it has a large number of attempts and is not successful.

For now, the attempts are set via a cmd flag (--max-attempts) which if not set, is 10 by default.

Usage Example

cd prover/prover_cli
zk f cargo run --release requeue --batch 1

Why ❔

We want to be able to requeue a stuck batch with the CLI.

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.
  • Linkcheck has been run via zk linkcheck.

@ilitteri ilitteri requested review from EmilLuta and Artemka374 April 18, 2024 00:30
@ilitteri
Copy link
Contributor Author

ilitteri commented Apr 18, 2024

@EmilLuta we can discuss this during the daily, but I think I'm missing a --batch flag to avoid requeuing multiple batches jobs. Also, I'm not sure if this is the same as the restart cmd

Copy link
Contributor

@EmilLuta EmilLuta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far, so good. As we chatted during daily, let's incorporate changes for the requeuer.

@ilitteri ilitteri changed the title feat(Prover CLI): requeue cmd scaffolding + requeue basic-witness-generator-jobs cmd feat(Prover CLI): requeue cmd Apr 25, 2024
@ilitteri ilitteri requested a review from EmilLuta April 25, 2024 19:17
@ilitteri ilitteri requested a review from ColoCarletti April 25, 2024 20:25
@Artemka374 Artemka374 enabled auto-merge May 14, 2024 14:55
@Artemka374 Artemka374 added this pull request to the merge queue May 14, 2024
Merged via the queue into main with commit f722df7 May 14, 2024
50 checks passed
@Artemka374 Artemka374 deleted the requeue_witness_generator_jobs branch May 14, 2024 15:52
RomanBrodetski pushed a commit that referenced this pull request May 17, 2024
🤖 I have created a release *beep* *boop*
---


##
[24.3.0](core-v24.2.0...core-v24.3.0)
(2024-05-16)


### Features

* Added support for making EN a (non-leader) consensus validator
(BFT-426)
([#1905](#1905))
([9973629](9973629))
* **configs:** Extract secrets to an additional config
([#1956](#1956))
([bab4d65](bab4d65))
* **en:** Fetch L1 batch root hashes from main node
([#1923](#1923))
([72a3571](72a3571))
* **eth-client:** Generalize RPC client
([#1898](#1898))
([a4e099f](a4e099f))
* **Prover CLI:** `requeue` cmd
([#1719](#1719))
([f722df7](f722df7))
* **Prover CLI:** `status batch --verbose`
([#1899](#1899))
([cf80184](cf80184))
* **pruning:** Vacuum freeze started daily
([#1929](#1929))
([5c85e9f](5c85e9f))
* Remove metrics crate
([#1902](#1902))
([5f7bda7](5f7bda7))
* **state-keeper:** Parallel l2 block sealing
([#1801](#1801))
([9b06dd8](9b06dd8))
* tee_verifier_input_producer
([#1860](#1860))
([fea7f16](fea7f16))
* **vm-runner:** implement output handler for VM runner
([#1856](#1856))
([1e4aeb5](1e4aeb5))


### Bug Fixes

* **basic_types:** bincode deserialization for `web3::Bytes`
([#1928](#1928))
([406ec8c](406ec8c))
* **config:** Fix data-handler-config
([#1919](#1919))
([b6bb041](b6bb041))
* **en:** Delete old txs by (init_addr, nonce)
([#1942](#1942))
([fa5f4a7](fa5f4a7))
* **en:** Fix reorg detector logic for dealing with last L1 batch
([#1906](#1906))
([3af5f5b](3af5f5b))
* parentHash in websocket blocks subscription is shown as 0x0
([#1946](#1946))
([fc2efad](fc2efad))
* **Prover CLI:** `status batch` bugs
([#1865](#1865))
([09682f2](09682f2))
* **utils:** bincode ser-/deserialization for `BytesToHexSerde`
([#1947](#1947))
([a75b917](a75b917))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: zksync-era-bot <zksync-era-bot@users.noreply.github.com>
RomanBrodetski pushed a commit that referenced this pull request May 17, 2024
🤖 I have created a release *beep* *boop*
---


##
[14.2.0](prover-v14.1.1...prover-v14.2.0)
(2024-05-17)


### Features

* Added support for making EN a (non-leader) consensus validator
(BFT-426)
([#1905](#1905))
([9973629](9973629))
* **configs:** Extract secrets to an additional config
([#1956](#1956))
([bab4d65](bab4d65))
* **eth-client:** Generalize RPC client
([#1898](#1898))
([a4e099f](a4e099f))
* **Prover CLI:** `delete` cmd
([#1802](#1802))
([6e4a92e](6e4a92e))
* **Prover CLI:** `requeue` cmd
([#1719](#1719))
([f722df7](f722df7))
* **Prover CLI:** `status batch --verbose`
([#1899](#1899))
([cf80184](cf80184))
* **state-keeper:** Parallel l2 block sealing
([#1801](#1801))
([9b06dd8](9b06dd8))
* tee_verifier_input_producer
([#1860](#1860))
([fea7f16](fea7f16))


### Bug Fixes

* **Prover CLI:** `status batch` bugs
([#1865](#1865))
([09682f2](09682f2))
* **prover:** Bump Cargo.lock and update VKs
([#1959](#1959))
([367baad](367baad))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants