Page MenuHomePhabricator

rpc: Expose g_is_mempool_loaded via getmempoolinfo
ClosedPublic

Authored by fpelliccioni on Oct 11 2019, 21:08.

Details

Summary

And use it to fix a race condition in mempool_persist.py:
https://travis-ci.org/Empact/bitcoin/jobs/487577243

Backport of Bitcoin Core PR15323
https://github.com/bitcoin/bitcoin/pull/15323

Depends on D4234 and D4266.

Test Plan
ninja check-all
  • Read the docs.

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

fpelliccioni edited the test plan for this revision. (Show Details)

I have to fix the squash

fpelliccioni edited the test plan for this revision. (Show Details)
fpelliccioni edited the test plan for this revision. (Show Details)

fix the rebase

Fabien requested changes to this revision.Oct 16 2019, 15:20
Fabien added inline comments.
src/validation.cpp
5641 ↗(On Diff #13562)

Part of the PR is missing here.

This revision now requires changes to proceed.Oct 16 2019, 15:20
src/validation.cpp
5641 ↗(On Diff #13562)

I tracked these changes to this commit:
https://github.com/jasonbcox/bitcoin/commit/26fee4f6b

It's very old, I guess it hasn't been backported on purpose.

I think you got the dependency reversed.

I think you got the dependency reversed.

I ordered the dependencies based on the date of the log:

12aa2ac98 - Merge #15323: rpc: Expose g_is_mempool_loaded via getmempoolinfo (2019-05-01 ~ 5 months ago) <MarcoFalke>
3515612e0 - Merge #15473: bench: Benchmark MempoolToJSON (2019-03-06 ~ 7 months ago) <MarcoFalke>
deadalnix requested changes to this revision.Oct 23 2019, 01:45

Please rebase, otherwise LGTM.

src/validation.cpp
5641 ↗(On Diff #13562)

You need to rebase on top of that patch.

This revision now requires changes to proceed.Oct 23 2019, 01:45
deadalnix requested changes to this revision.Oct 24 2019, 01:07

Actually do the rebase an the backport, not just run the git rebase command.

This revision now requires changes to proceed.Oct 24 2019, 01:07

Actually do the rebase an the backport, not just run the git rebase command.

Sorry for not clarifying what I did:
D4266 was landed...
Then I rebased from master: git rebase -i master
... and then from the D4234 branch: git rebase -i arcpatch-D4234

Please see my previous comment clarifying how I made the rebase.

deadalnix requested changes to this revision.Oct 25 2019, 01:05
deadalnix added inline comments.
src/validation.cpp
5647 ↗(On Diff #13673)

here

This revision now requires changes to proceed.Oct 25 2019, 01:05
This revision is now accepted and ready to land.Oct 28 2019, 00:02