Skip to content

Commit 0873afb

Browse files
committed
dialyzer fixes
1 parent d175fa2 commit 0873afb

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

src/ra.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ start_in(DataDir) ->
157157
ra_env:configure_logger(logger),
158158
LogFile = filename:join(DataDir, "ra.log"),
159159
SaslFile = filename:join(DataDir, "ra_sasl.log"),
160-
logger:remove_handler(ra_handler),
160+
_ = logger:remove_handler(ra_handler),
161161
ok = logger:set_primary_config(level, debug),
162162
Config = #{config => #{file => LogFile}},
163163
ok = logger:add_handler(ra_handler, logger_std_h, Config),
164-
application:load(sasl),
165-
application:set_env(sasl, sasl_error_logger, {file, SaslFile}),
166-
application:stop(sasl),
167-
application:start(sasl),
164+
ok = application:load(sasl),
165+
ok = application:set_env(sasl, sasl_error_logger, {file, SaslFile}),
166+
ok = application:stop(sasl),
167+
ok = application:start(sasl),
168168
_ = error_logger:tty(false),
169169
start([{data_dir, DataDir}]).
170170

src/ra_kv_harness.erl

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,14 @@ run(NumOperations) ->
8080
run(NumOperations, #{}).
8181

8282
read_all_keys() ->
83-
[_ = ra_kv:get({?CLUSTER_NAME,
83+
[begin
84+
_ = ra_kv:get({?CLUSTER_NAME,
8485
node()},
85-
<<"key_",(integer_to_binary(N))/binary>>, 1000)
86-
|| N <- lists:seq(1, ?MAX_KEY)],
87-
ok.
86+
<<"key_",(integer_to_binary(N))/binary>>, 1000),
87+
ok
88+
end
89+
|| N <- lists:seq(1, ?MAX_KEY)],
90+
ok.
8891

8992
read_all_keys_loop(Members0) when is_list(Members0) ->
9093
receive
@@ -114,9 +117,9 @@ read_all_keys_loop(Members0) when is_list(Members0) ->
114117
run(NumOperations, Options) when NumOperations > 0 ->
115118
% Start with a random number of nodes between 1 and 7
116119
NumNodes = rand:uniform(7),
117-
logger:set_primary_config(level, warning),
118-
application:set_env(sasl, sasl_error_logger, false),
119-
application:stop(sasl),
120+
ok = logger:set_primary_config(level, warning),
121+
ok = application:set_env(sasl, sasl_error_logger, false),
122+
ok = application:stop(sasl),
120123
log("~s Starting cluster with ~p nodes~n", [timestamp(), NumNodes]),
121124
case setup_cluster(NumNodes, Options) of
122125
{ok, Members, PeerNodes} ->
@@ -705,8 +708,9 @@ execute_operation(State, {network_partition}) ->
705708
% Block communication between partitioned node and other nodes
706709
% The harness node (current node) maintains access to all nodes
707710
[begin
708-
erpc:call(NodeToPartitionName, inet_tcp_proxy_dist, block, [OtherNode]),
709-
erpc:call(OtherNode, inet_tcp_proxy_dist, block, [NodeToPartitionName])
711+
_ = erpc:call(NodeToPartitionName, inet_tcp_proxy_dist, block, [OtherNode]),
712+
_ = erpc:call(OtherNode, inet_tcp_proxy_dist, block, [NodeToPartitionName]),
713+
ok
710714
end || OtherNode <- OtherNodes],
711715

712716
State#{operations_count => OpCount + 1,
@@ -799,7 +803,7 @@ perform_consistency_check(State, MembersToValidate) ->
799803

800804
% Write full details to log file with difference analysis
801805
LogEntry = format_consistency_failure(MembersToValidate, ValidationResults),
802-
file:write_file("ra_kv_harness.log", LogEntry, [append]),
806+
ok = file:write_file("ra_kv_harness.log", LogEntry, [append]),
803807

804808
FailedOps = maps:get(failed_ops, State),
805809
State#{failed_ops => FailedOps + 1, remaining_ops => 0, consistency_failed => true}

src/ra_log.erl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ init(#{uid := UId,
262262
[begin
263263
?DEBUG("~ts: deleting overwritten segment ~w",
264264
[LogId, SR]),
265-
catch prim_file:delete(filename:join(Dir, F))
265+
_ = catch prim_file:delete(filename:join(Dir, F)),
266+
ok
266267
end
267268
|| {F, _} = SR <- SegRefs -- ra_log_segments:segment_refs(Reader)],
268269

@@ -885,7 +886,8 @@ handle_event({segments, TidSeqs, NewSegs},
885886
[begin
886887
?DEBUG("~ts: deleting overwritten segment ~w",
887888
[LogId, SR]),
888-
catch prim_file:delete(filename:join(Dir, F))
889+
_ = catch prim_file:delete(filename:join(Dir, F)),
890+
ok
889891
end
890892
|| {F, _} = SR <- OverwrittenSegRefs],
891893
ok

src/ra_log_segments.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ handle_compaction_result(#compaction_result{unreferenced = Unreferenced,
288288
end
289289
end, Open0, Unreferenced),
290290
Fun = fun () ->
291-
[prim_file:delete(filename:join(Dir, F))
291+
[ok = prim_file:delete(filename:join(Dir, F))
292292
|| F <- Unreferenced],
293293
purge_dangling_symlinks(Dir),
294294
ok
@@ -318,7 +318,7 @@ handle_compaction_result(#compaction_result{unreferenced = Unreferenced,
318318
FilteredRefs, lists:reverse(CompactedSegRefs)),
319319
Open = ra_flru:evict_all(Open0),
320320
Fun = fun () ->
321-
[prim_file:delete(filename:join(Dir, F))
321+
[ok = prim_file:delete(filename:join(Dir, F))
322322
|| F <- Unreferenced],
323323
purge_dangling_symlinks(Dir),
324324
ok

src/ra_lol.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ basic_test() ->
262262
end
263263
end,
264264
[begin
265-
{T, _} = ?MODULE:search(SearchFun(T), L1)
265+
{T, _} = ?MODULE:search(SearchFun(T), L1),
266+
ok
266267
end || T <- Items ++ [101]],
267268

268269
%% test searching with a continuation

0 commit comments

Comments
 (0)