diff options
| author | Erlang/OTP <[email protected]> | 2015-10-05 11:00:50 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-10-05 11:00:50 +0200 |
| commit | 192c247af496b6b33775cfad21b8cebdadd96823 (patch) | |
| tree | 3cf6bf162214d68d024764b44a42d6b0bbe540b8 | |
| parent | 387eed25bdf60098dd7972c674fb2a982686c220 (diff) | |
| parent | d22396bce11debcbb6d8826468bd111ac0efbf7b (diff) | |
| download | otp-192c247af496b6b33775cfad21b8cebdadd96823.tar.gz otp-192c247af496b6b33775cfad21b8cebdadd96823.tar.bz2 otp-192c247af496b6b33775cfad21b8cebdadd96823.zip | |
Merge branch 'dgud/mnesia/restore-leak/OTP-13025' into maint-18
* dgud/mnesia/restore-leak/OTP-13025:
mnesia: Fix mnesia:restore/2 which caused a disk_log leak
| -rw-r--r-- | lib/mnesia/src/mnesia_bup.erl | 14 | ||||
| -rw-r--r-- | lib/mnesia/test/mnesia_evil_backup.erl | 10 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl index 0e653f2bc4..1f150ae38b 100644 --- a/lib/mnesia/src/mnesia_bup.erl +++ b/lib/mnesia/src/mnesia_bup.erl @@ -157,10 +157,11 @@ fallback_to_schema(Fname) -> read_schema(Mod, Opaque) -> R = #restore{bup_module = Mod, bup_data = Opaque}, try read_schema_section(R) of - {_, {_Header, Schema, _}} -> Schema + {R2, {_Header, Schema, _}} -> + close_read(R2), + Schema catch throw:{error,_} = Error -> Error - after close_read(R) end. %% Open backup media and extract schema @@ -173,8 +174,13 @@ read_schema_section(R) -> do_read_schema_section(R) -> R2 = safe_apply(R, open_read, [R#restore.bup_data]), - {R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]), - do_read_schema_section(R3, verify_header(RawSchema), []). + try + {R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]), + do_read_schema_section(R3, verify_header(RawSchema), []) + catch T:E -> + close_read(R2), + erlang:raise(T,E,erlang:get_stacktrace()) + end. do_read_schema_section(R, {ok, B, C, []}, Acc) -> case safe_apply(R, read, [R#restore.bup_data]) of diff --git a/lib/mnesia/test/mnesia_evil_backup.erl b/lib/mnesia/test/mnesia_evil_backup.erl index 89f2861661..e605fa7926 100644 --- a/lib/mnesia/test/mnesia_evil_backup.erl +++ b/lib/mnesia/test/mnesia_evil_backup.erl @@ -232,7 +232,13 @@ restore(Config, Op) -> Res21 = [{Tab2, N, N+1} || N <- lists:seq(1, 11)], Res31 = [[{Tab3, N, N+1}, {Tab3, N, N+44}] || N <- lists:seq(1, 10)], - + Check = fun() -> + [disk_log:pid2name(X) || + X <- processes(), Data <- [process_info(X, [current_function])], + Data =/= undefined, + element(1, element(2, lists:keyfind(current_function, 1, Data)))=:= disk_log] + end, + Before = Check(), ?match({atomic, [Tab1]}, Restore(File1, [{Op, [Tab1]}, {skip_tables, Tabs -- [Tab1]}])), case Op of @@ -319,6 +325,8 @@ restore(Config, Op) -> end, ?match(ok, file:delete(File1)), ?match(ok, file:delete(File2)), + ?match([], Check() -- Before), + ?verify_mnesia(Nodes, []). |