Paths

Table of Contentst

Differential D4243

rpc: Expose g_is_mempool_loaded via getmempoolinfo
ClosedPublic
Actions

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

Tags

None

Subscribers

None

Details

Reviewers

Fabien
deadalnix

Group Reviewers

Restricted Project

Commits

rSTAGINGf316cd272e95: rpc: Expose g_is_mempool_loaded via getmempoolinfo
rABCf316cd272e95: rpc: Expose g_is_mempool_loaded via getmempoolinfo

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 created this revision.Oct 11 2019, 21:08

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 11 2019, 21:08

Herald added a reviewer: deadalnix. · View Herald Transcript

Build Bitcoin-ABC / Diffs / Diff Testing started.

I have to fix the squash

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7747: Diff 13506.Oct 11 2019, 21:23

fpelliccioni edited the summary of this revision. (Show Details)Oct 15 2019, 13:46

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

fpelliccioni mentioned this in D4234: bench: Benchmark MempoolToJSON.Oct 15 2019, 13:58

fix the rebase

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7777: Diff 13562.Oct 15 2019, 14:19

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

fpelliccioni added inline comments.Oct 16 2019, 15:47

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.

fpelliccioni edited the summary of this revision. (Show Details)Oct 17 2019, 17:39

fpelliccioni added a parent revision: D4266: [mempool] Mark mempool import fails that were found in mempool as 'already there'.

In D4243#102663, @deadalnix wrote:

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>

fpelliccioni requested review of this revision.Oct 18 2019, 14:26

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

rebased

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7855: Diff 13673.Oct 23 2019, 19:31

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

In D4243#103472, @deadalnix wrote:

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

Applies backport changes.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7869: Diff 13701.Oct 25 2019, 15:13

Fabien accepted this revision.Oct 26 2019, 06:53

deadalnix accepted this revision.Oct 28 2019, 00:02

This revision is now accepted and ready to land.Oct 28 2019, 00:02

rebase from master

Build Bitcoin-ABC / Diffs / Diff Testing started.

Harbormaster completed remote builds in B7894: Diff 13740.Oct 29 2019, 14:43

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Closed by commit rABCf316cd272e95: rpc: Expose g_is_mempool_loaded via getmempoolinfo (authored by MarcoFalke <falke.marco@gmail.com>, committed by fpelliccioni). · Explain WhyOct 29 2019, 14:46

This revision was automatically updated to reflect the committed changes.

fpelliccioni added a commit: rABCf316cd272e95: rpc: Expose g_is_mempool_loaded via getmempoolinfo.

fpelliccioni added a commit: rSTAGINGf316cd272e95: rpc: Expose g_is_mempool_loaded via getmempoolinfo.Apr 7 2020, 21:30

Revision Contents
Changeset List

Path

Size

doc/

REST-interface.md

1 line

src/

8 lines

rpc/

7 lines

8 lines

10 lines

5 lines

21 lines

test/

functional/

mempool_persist.py

17 lines

Diff 13741

doc/REST-interface.md

Loading...

src/init.cpp

Loading...

src/rpc/blockchain.cpp

Loading...

src/txmempool.h

Loading...

src/txmempool.cpp

Loading...

src/validation.h

Loading...

src/validation.cpp

Loading...

test/functional/mempool_persist.py

Loading...