diff options
author | Erlang/OTP <[email protected]> | 2019-05-06 17:09:11 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2019-05-06 17:09:11 +0200 |
commit | f62aeddff8fbd9653a54360b1c99d9d50705b359 (patch) | |
tree | 7f341f71a0292ad65473af2091cc0f9063994fb0 | |
parent | eb9b9e00b68a2cceafff60d55da74d72ab594ab4 (diff) | |
parent | ebfeb2bb5046143c4da2bcc8141b40b29448717b (diff) | |
download | otp-f62aeddff8fbd9653a54360b1c99d9d50705b359.tar.gz otp-f62aeddff8fbd9653a54360b1c99d9d50705b359.tar.bz2 otp-f62aeddff8fbd9653a54360b1c99d9d50705b359.zip |
Merge branch 'siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758' into maint-21
* siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758:
[ct] Make sure log cache file is completely written before it is read
-rw-r--r-- | lib/common_test/src/ct_logs.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index 07a1693d5d..a11613bca2 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -149,7 +149,7 @@ close(Info, StartDir) -> ok; CacheBin -> %% save final version of the log cache to file - _ = file:write_file(?log_cache_name,CacheBin), + write_log_cache(CacheBin), put(ct_log_cache,undefined) end end, @@ -2022,7 +2022,7 @@ update_all_runs_in_cache(AllRunsData) -> %% read from file as long as this logger process is alive put(ct_log_cache,term_to_binary(LogCache)); _ -> - file:write_file(?log_cache_name,term_to_binary(LogCache)) + write_log_cache(term_to_binary(LogCache)) end; SavedLogCache -> update_all_runs_in_cache(AllRunsData,binary_to_term(SavedLogCache)) @@ -2036,7 +2036,7 @@ update_all_runs_in_cache(AllRunsData, LogCache) -> %% read from file as long as this logger process is alive put(ct_log_cache,term_to_binary(LogCache1)); _ -> - file:write_file(?log_cache_name,term_to_binary(LogCache1)) + write_log_cache(term_to_binary(LogCache1)) end. sort_all_runs(Dirs) -> @@ -2668,7 +2668,7 @@ update_tests_in_cache(TempData,LogCache=#log_cache{tests=Tests}) -> {_Pid,_Pid} -> put(ct_log_cache,CacheBin); _ -> - file:write_file(?log_cache_name,CacheBin) + write_log_cache(CacheBin) end. %% @@ -3400,3 +3400,9 @@ unexpected_io(Pid, _Category, _Importance, Content, CtLogFd, EscChars) -> Data = io_lib:format("~ts", [lists:foldl(IoFun, [], Content)]), test_server_io:print_unexpected(Data), ok. + +write_log_cache(LogCacheBin) when is_binary(LogCacheBin) -> + TmpFile = ?log_cache_name++".tmp", + _ = file:write_file(TmpFile,LogCacheBin), + _ = file:rename(TmpFile,?log_cache_name), + ok. |