Skip to content

Fix scan error deadlock #190

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 12, 2014
Merged

Fix scan error deadlock #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8370dbf
Add failing scan error test
engelsanchez Sep 5, 2014
4862bf6
Fix scan error deadlock
engelsanchez Sep 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/bitcask.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,6 +1241,7 @@ init_keydir(Dirname, WaitTime, ReadWriteModeP, KT) ->

case ScanResult of
{error, _} ->
ok = bitcask_nifs:keydir_release(KeyDir),
ScanResult;
_ ->
%% Now that we loaded all the data, mark the keydir as ready
Expand Down Expand Up @@ -3210,6 +3211,26 @@ update_tstamp_stats_test2() ->
bitcask_time:test__clear_fudge()
end.

scan_err_test_() ->
{setup,
fun() ->
meck:new(bitcask_fileops, [passthrough]),
ok
end,
fun(_) ->
meck:unload()
end,
[fun() ->
Dir = "/tmp/bc.scan.err",
meck:expect(bitcask_fileops, data_file_tstamps,
fun(_) -> {error, because} end),
?assertMatch({error, _}, bitcask:open(Dir)),
meck:unload(bitcask_fileops),
B = bitcask:open(Dir),
?assertMatch({true, B}, {is_reference(B), B}),
ok = bitcask:close(B)
end]}.

total_byte_stats_test_() ->
{timeout, 60, fun total_byte_stats_test2/0}.

Expand Down