HomePhabricator

Merge #12681: Fix ComputeTimeSmart test failure with -DDEBUG_LOCKORDER

Description

Merge #12681: Fix ComputeTimeSmart test failure with -DDEBUG_LOCKORDER

Summary:
33eb9071b9 Fix ComputeTimeSmart test failure with -DDEBUG_LOCKORDER (Russell Yanofsky)

Pull request description:

Failure looks like:

```
Entering test case "ComputeTimeSmart"
test_bitcoin: sync.cpp:100: void potential_deadlock_detected(const std::pair<void*, void*>&, const LockStack&, const LockStack&): Assertion `false' failed.
unknown location(0): fatal error in "ComputeTimeSmart": signal: SIGABRT (application abort requested)
wallet/test/wallet_tests.cpp(566): last checkpoint
```

Reproducible with:

```
./configure --enable-debug
make -C src test/test_bitcoin && src/test/test_bitcoin --log_level=test_suite --run_test=wallet_tests/ComputeTimeSmart
```

Seems to be caused by acquiring `cs_main` inside `CWallet::ComputeTimeSmart` in #11041.

I think this may be causing timeouts on travis like: https://travis-ci.org/bitcoin/bitcoin/jobs/353005676#L2692

Tree-SHA512: b263cd122ea9c88204d1d8e7e35291c71ea6319f05114c5009235a75dbd0f669bc0394f44afeed0d9eb08c2a956cd7c08f1ac4ef28616932fef9b43eaac5521b

Backport of Core PR 12681
https://github.com/bitcoin/bitcoin/pull/12681/files

Test Plan:
make check
test_runner.py

Reviewers: deadalnix, Fabien, #bitcoin_abc

Reviewed By: Fabien, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D2973

Details

Provenance
MarcoFalke <falke.marco@gmail.com>Authored on Mar 14 2018, 00:15
jasonbcoxCommitted on May 8 2019, 18:08
jasonbcoxPushed on May 8 2019, 18:08
Reviewer
Restricted Project
Differential Revision
D2973: Merge #12681: Fix ComputeTimeSmart test failure with -DDEBUG_LOCKORDER
Parents
rABCfde4c39de298: Merge #11744: net: Add missing locks in net.{cpp,h}
Branches
Unknown
Tags
Unknown