diff options
| author | Dan Gudmundsson <[email protected]> | 2015-03-11 15:59:37 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-03-11 15:59:37 +0100 |
| commit | a8cd2a465d6bc55b49f45be099213a5a06ee7f98 (patch) | |
| tree | 812c1efbbdc66a7b8115cab49f4c7b80fe06a27e /lib/mnesia/src | |
| parent | 1fe6b124f3ab9f69f043081edeee0cbce666f3f2 (diff) | |
| parent | 47c44f3de3d5bf4251c35cf49474c3e29ad2933b (diff) | |
| download | otp-a8cd2a465d6bc55b49f45be099213a5a06ee7f98.tar.gz otp-a8cd2a465d6bc55b49f45be099213a5a06ee7f98.tar.bz2 otp-a8cd2a465d6bc55b49f45be099213a5a06ee7f98.zip | |
Merge branch 'maint'
* maint:
mnesia: Flush late messages
Add Debug info
mnesia: better debug info when tests fail
mnesia: Ensure tables are loaded before testing them
Diffstat (limited to 'lib/mnesia/src')
| -rw-r--r-- | lib/mnesia/src/mnesia_locker.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl index e27396731f..1efb939e00 100644 --- a/lib/mnesia/src/mnesia_locker.erl +++ b/lib/mnesia/src/mnesia_locker.erl @@ -982,8 +982,14 @@ sticky_flush(Ns=[Node | Tail], Store) -> flush_remaining([], _SkipNode, Res) -> del_debug(), exit(Res); -flush_remaining([SkipNode | Tail ], SkipNode, Res) -> - flush_remaining(Tail, SkipNode, Res); +flush_remaining(Ns=[SkipNode | Tail ], SkipNode, Res) -> + add_debug(Ns), + receive + {?MODULE, SkipNode, _} -> + flush_remaining(Tail, SkipNode, Res) + after 0 -> + flush_remaining(Tail, SkipNode, Res) + end; flush_remaining(Ns=[Node | Tail], SkipNode, Res) -> add_debug(Ns), receive |