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

[fix]: mkdir -r with store path, not lock path #3908

Merged
merged 4 commits into from
Sep 21, 2023

Conversation

0x009922
Copy link
Contributor

Description

TBH, I am lazy to prepare a proper reproduction of the bug. In my case, Iroha repeatedly failed to start, complaining about existence of the lock file all the time. After all, it turned out that ./storage/kura.lock, created by Iroha, is a directory, not a file.

This PR makes variables naming clearer, and passes actual block-store path into mkdir -r, not the path of the lockfile.

@0x009922 0x009922 added Bug Something isn't working iroha2-dev The re-implementation of a BFT hyperledger in RUST labels Sep 21, 2023
Signed-off-by: Dmitry Balashov <[email protected]>
core/src/kura.rs Outdated Show resolved Hide resolved
DCNick3
DCNick3 previously approved these changes Sep 21, 2023
@coveralls
Copy link
Collaborator

coveralls commented Sep 21, 2023

Pull Request Test Coverage Report for Build 6259473002

  • 5 of 10 (50.0%) changed or added relevant lines in 1 file are covered.
  • 6113 unchanged lines in 102 files lost coverage.
  • Overall coverage decreased (-1.1%) to 58.327%

Changes Missing Coverage Covered Lines Changed/Added Lines %
core/src/kura.rs 5 10 50.0%
Files with Coverage Reduction New Missed Lines %
cli/src/main.rs 1 0.0%
cli/src/torii/pagination.rs 1 98.9%
config/base/src/runtime_upgrades.rs 1 51.72%
config/src/torii.rs 1 96.67%
core/src/smartcontracts/isi/block.rs 1 87.5%
crypto/src/merkle.rs 1 96.23%
data_model/derive/src/partially_tagged.rs 1 99.67%
data_model/src/domain.rs 1 47.37%
logger/src/lib.rs 1 95.15%
config/src/lib.rs 2 0.0%
Totals Coverage Status
Change from base Build 5423219773: -1.1%
Covered Lines: 21419
Relevant Lines: 36722

💛 - Coveralls

core/src/kura.rs Outdated Show resolved Hide resolved
Signed-off-by: Dmitry Balashov <[email protected]>
pesterev
pesterev previously approved these changes Sep 21, 2023
DCNick3
DCNick3 previously approved these changes Sep 21, 2023
Signed-off-by: Dmitry Balashov <[email protected]>
@0x009922 0x009922 dismissed stale reviews from DCNick3 and pesterev via 6de9bc3 September 21, 2023 08:59
@0x009922 0x009922 merged commit 7bcb291 into hyperledger:iroha2-dev Sep 21, 2023
8 checks passed
@0x009922 0x009922 deleted the fix-kura-lock-mkdir branch September 21, 2023 12:10
6r1d pushed a commit that referenced this pull request Oct 17, 2023
* [fix]: `mkdir -r` with store path, not lock path

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `store_path` in the err

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: `&`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lint

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
6r1d pushed a commit that referenced this pull request Oct 17, 2023
* [fix]: `mkdir -r` with store path, not lock path

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `store_path` in the err

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: `&`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lint

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
mversic pushed a commit that referenced this pull request Oct 17, 2023
* [fix]: `mkdir -r` with store path, not lock path

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `store_path` in the err

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: `&`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lint

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working iroha2-dev The re-implementation of a BFT hyperledger in RUST
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants