Skip to content

Commit 3a67bee

Browse files
hsun324facebook-github-bot
authored andcommitted
Revert auto-format enablement
Summary: Revert blanket auto-format enablement Reviewed By: jaher Differential Revision: D76519999 fbshipit-source-id: 1c122995369beb1db9ba2ccf3fc54117c92b784b
1 parent 2776166 commit 3a67bee

31 files changed

+1154
-2110
lines changed

examples/kvstore/src/kvstore_app.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in

examples/kvstore/src/kvstore_client.erl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in
@@ -23,18 +22,18 @@
2322
-define(NUM_PARTITIONS, 4).
2423

2524
%% Read value for a given key. It's a blocking call.
26-
-spec read(term()) -> {ok, term()} | wa_raft_acceptor:read_error().
25+
-spec read(term()) -> {ok, term()} | wa_raft_acceptor:read_error().
2726
read(Key) ->
2827
Acceptor = ?RAFT_ACCEPTOR_NAME(?TABLE, partition(Key)),
2928
wa_raft_acceptor:read(Acceptor, {read, ?TABLE, Key}, ?CALL_TIMEOUT).
3029

3130
%% Write a key/value pair to storage. It's a blocking call.
32-
-spec write(term(), term()) -> ok | wa_raft_acceptor:commit_error().
31+
-spec write(term(), term()) -> ok | wa_raft_acceptor:commit_error().
3332
write(Key, Value) ->
3433
commit(Key, {write, ?TABLE, Key, Value}).
3534

3635
%% Delete a key/value pair. It's a blocking call.
37-
-spec delete(term()) -> ok | wa_raft_acceptor:commit_error().
36+
-spec delete(term()) -> ok | wa_raft_acceptor:commit_error().
3837
delete(Key) ->
3938
commit(Key, {delete, ?TABLE, Key}).
4039

examples/kvstore/src/kvstore_sup.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in

include/wa_raft.hrl

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in
@@ -54,16 +53,12 @@
5453
-define(SNAPSHOT_NAME(Index, Term), (?SNAPSHOT_PREFIX "." ++ integer_to_list(Index) ++ "." ++ integer_to_list(Term))).
5554

5655
%% Witness Snapshot name
57-
-define(WITNESS_SNAPSHOT_NAME(Index, Term),
58-
(?SNAPSHOT_PREFIX "." ++ integer_to_list(Index) ++ "." ++ integer_to_list(Term) ++ ".witness")
59-
).
56+
-define(WITNESS_SNAPSHOT_NAME(Index, Term), (?SNAPSHOT_PREFIX "." ++ integer_to_list(Index) ++ "." ++ integer_to_list(Term) ++ ".witness")).
6057

6158
%% Location of a snapshot
6259
-define(RAFT_SNAPSHOT_PATH(Path, Name), (filename:join(Path, Name))).
6360
-define(RAFT_SNAPSHOT_PATH(Table, Partition, Name), ?RAFT_SNAPSHOT_PATH(?RAFT_PARTITION_PATH(Table, Partition), Name)).
64-
-define(RAFT_SNAPSHOT_PATH(Table, Partition, Index, Term),
65-
?RAFT_SNAPSHOT_PATH(Table, Partition, ?SNAPSHOT_NAME(Index, Term))
66-
).
61+
-define(RAFT_SNAPSHOT_PATH(Table, Partition, Index, Term), ?RAFT_SNAPSHOT_PATH(Table, Partition, ?SNAPSHOT_NAME(Index, Term))).
6762

6863
%% [Transport] Atomics - field index for update timestamp
6964
-define(RAFT_TRANSPORT_ATOMICS_UPDATED_TS, 1).
@@ -108,9 +103,7 @@
108103
%% Maximum number of incoming snapshots by snapshot transfer.
109104
-define(RAFT_MAX_CONCURRENT_INCOMING_SNAPSHOT_TRANSFERS(), ?RAFT_CONFIG(raft_max_incoming_snapshot_transfers, 10)).
110105
%% Maximum number of incoming witness snapshots by snapshot transfer.
111-
-define(RAFT_MAX_CONCURRENT_INCOMING_WITNESS_SNAPSHOT_TRANSFERS(),
112-
?RAFT_CONFIG(raft_max_incoming_witness_snapshot_transfers, 16)
113-
).
106+
-define(RAFT_MAX_CONCURRENT_INCOMING_WITNESS_SNAPSHOT_TRANSFERS(), ?RAFT_CONFIG(raft_max_incoming_witness_snapshot_transfers, 16)).
114107

115108
%% Default cross-node call timeout for heartbeats made for bulk logs catchup
116109
-define(RAFT_CATCHUP_HEARTBEAT_TIMEOUT(), ?RAFT_CONFIG(raft_catchup_rpc_timeout_ms, 5000)).
@@ -139,9 +132,7 @@
139132

140133
%% Maximum number of pending applies for any single RAFT partition
141134
-define(RAFT_MAX_PENDING_APPLIES, raft_max_pending_applies).
142-
-define(RAFT_MAX_PENDING_APPLIES(App),
143-
?RAFT_APP_CONFIG(App, {?RAFT_MAX_PENDING_APPLIES, raft_apply_queue_max_size}, 1000)
144-
).
135+
-define(RAFT_MAX_PENDING_APPLIES(App), ?RAFT_APP_CONFIG(App, {?RAFT_MAX_PENDING_APPLIES, raft_apply_queue_max_size}, 1000)).
145136
%% Maximum bytes of pending applies for any single RAFT partition
146137
-define(RAFT_MAX_PENDING_APPLY_BYTES, raft_max_pending_apply_bytes).
147138
-define(RAFT_MAX_PENDING_APPLY_BYTES(App), ?RAFT_APP_CONFIG(App, ?RAFT_MAX_PENDING_APPLY_BYTES, 32_000_000)).
@@ -182,9 +173,7 @@
182173
%% Maximum number of log entries to speculatively retain in the log due to followers
183174
%% not yet reporting having replicated the log entry locally
184175
-define(RAFT_MAX_RETAINED_ENTRIES, raft_max_retained_entries).
185-
-define(RAFT_MAX_RETAINED_ENTRIES(App),
186-
?RAFT_APP_CONFIG(App, {?RAFT_MAX_RETAINED_ENTRIES, max_log_rotate_delay}, 1500000)
187-
).
176+
-define(RAFT_MAX_RETAINED_ENTRIES(App), ?RAFT_APP_CONFIG(App, {?RAFT_MAX_RETAINED_ENTRIES, max_log_rotate_delay}, 1500000)).
188177

189178
%% Maximum number of log entries to queue for application by storage at once before
190179
%% continuing to process the incoming message queue on the RAFT server.
@@ -193,9 +182,7 @@
193182
%% Maximum bytes of log entries to queue for application by storage at once before
194183
%% continuing to process the incoming message queue on the RAFT server.
195184
-define(RAFT_MAX_CONSECUTIVE_APPLY_BYTES, raft_apply_batch_max_bytes).
196-
-define(RAFT_MAX_CONSECUTIVE_APPLY_BYTES(App),
197-
?RAFT_APP_CONFIG(App, ?RAFT_MAX_CONSECUTIVE_APPLY_BYTES, 200 * 4 * 1024)
198-
).
185+
-define(RAFT_MAX_CONSECUTIVE_APPLY_BYTES(App), ?RAFT_APP_CONFIG(App, ?RAFT_MAX_CONSECUTIVE_APPLY_BYTES, 200 * 4 * 1024)).
199186

200187
%% Minimum time in milliseconds since the receiving the last valid leader heartbeat
201188
%% before triggering a new election due to term timeout. This time should be much
@@ -235,9 +222,7 @@
235222
%% handover before they are ready. This defaults to equal to the maximum number
236223
%% of missing log entries. (See `?RAFT_HANDOVER_MAX_ENTRIES`.)
237224
-define(RAFT_HANDOVER_MAX_UNAPPLIED_ENTRIES, raft_handover_max_unapplied_entries).
238-
-define(RAFT_HANDOVER_MAX_UNAPPLIED_ENTRIES(App),
239-
?RAFT_APP_CONFIG(App, ?RAFT_HANDOVER_MAX_UNAPPLIED_ENTRIES, undefined)
240-
).
225+
-define(RAFT_HANDOVER_MAX_UNAPPLIED_ENTRIES(App), ?RAFT_APP_CONFIG(App, ?RAFT_HANDOVER_MAX_UNAPPLIED_ENTRIES, undefined)).
241226
%% Maximum total byte size of log entries to include in a Handover RPC.
242227
-define(RAFT_HANDOVER_MAX_BYTES, raft_max_handover_log_size).
243228
-define(RAFT_HANDOVER_MAX_BYTES(App), ?RAFT_APP_CONFIG(App, ?RAFT_HANDOVER_MAX_BYTES, 50 * 1024 * 1024)).
@@ -256,9 +241,7 @@
256241
%% Whether log rotation should be controlled by local log length or by
257242
%% leader-announced cluster trimming index
258243
-define(RAFT_LOG_ROTATION_BY_TRIM_INDEX, raft_rotate_by_trim_index).
259-
-define(RAFT_LOG_ROTATION_BY_TRIM_INDEX(App),
260-
(?RAFT_APP_CONFIG(App, {?RAFT_LOG_ROTATION_BY_TRIM_INDEX, use_trim_index}, false) =:= true)
261-
).
244+
-define(RAFT_LOG_ROTATION_BY_TRIM_INDEX(App), (?RAFT_APP_CONFIG(App, {?RAFT_LOG_ROTATION_BY_TRIM_INDEX, use_trim_index}, false) =:= true)).
262245

263246
%% Whether or not the log should return entries in external term format
264247
%% when log entries are fetched for heartbeats
@@ -279,24 +262,16 @@
279262
-define(RAFT_CATCHUP_MAX_ENTRIES_PER_BATCH(App), ?RAFT_APP_CONFIG(App, ?RAFT_CATCHUP_MAX_ENTRIES_PER_BATCH, 800)).
280263
%% Maximum bytes per heartbeat for catchup by bulk log transfer
281264
-define(RAFT_CATCHUP_MAX_BYTES_PER_BATCH, raft_catchup_log_batch_bytes).
282-
-define(RAFT_CATCHUP_MAX_BYTES_PER_BATCH(App),
283-
?RAFT_APP_CONFIG(App, ?RAFT_CATCHUP_MAX_BYTES_PER_BATCH, 4 * 1024 * 1024)
284-
).
265+
-define(RAFT_CATCHUP_MAX_BYTES_PER_BATCH(App), ?RAFT_APP_CONFIG(App, ?RAFT_CATCHUP_MAX_BYTES_PER_BATCH, 4 * 1024 * 1024)).
285266
% Time to wait before retrying snapshot transport to a overloaded peer.
286267
-define(RAFT_SNAPSHOT_CATCHUP_OVERLOADED_BACKOFF_MS, snapshot_catchup_overloaded_backoff_ms).
287-
-define(RAFT_SNAPSHOT_CATCHUP_OVERLOADED_BACKOFF_MS(App),
288-
?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_OVERLOADED_BACKOFF_MS, 1000)
289-
).
268+
-define(RAFT_SNAPSHOT_CATCHUP_OVERLOADED_BACKOFF_MS(App), ?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_OVERLOADED_BACKOFF_MS, 1000)).
290269
% Time to wait before allowing a rerun of a completed snapshot transport.
291270
-define(RAFT_SNAPSHOT_CATCHUP_COMPLETED_BACKOFF_MS, raft_snapshot_catchup_completed_backoff_ms).
292-
-define(RAFT_SNAPSHOT_CATCHUP_COMPLETED_BACKOFF_MS(App),
293-
?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_COMPLETED_BACKOFF_MS, 20 * 1000)
294-
).
271+
-define(RAFT_SNAPSHOT_CATCHUP_COMPLETED_BACKOFF_MS(App), ?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_COMPLETED_BACKOFF_MS, 20 * 1000)).
295272
% Time to wait before allowing a rerun of a failed snapshot transport.
296273
-define(RAFT_SNAPSHOT_CATCHUP_FAILED_BACKOFF_MS, raft_snapshot_catchup_failed_backoff_ms).
297-
-define(RAFT_SNAPSHOT_CATCHUP_FAILED_BACKOFF_MS(App),
298-
?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_FAILED_BACKOFF_MS, 10 * 1000)
299-
).
274+
-define(RAFT_SNAPSHOT_CATCHUP_FAILED_BACKOFF_MS(App), ?RAFT_APP_CONFIG(App, ?RAFT_SNAPSHOT_CATCHUP_FAILED_BACKOFF_MS, 10 * 1000)).
300275

301276
%% Number of omitted log entries to skip actually applying to storage when
302277
%% operating as a witness.

include/wa_raft_rpc.hrl

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in
@@ -16,16 +15,13 @@
1615
%% This means that RPC formats should not be changed once created.
1716
%%-------------------------------------------------------------------
1817

19-
-define(RAFT_NAMED_RPC(Type, Term, SenderName, SenderNode, Payload),
20-
{rpc, Type, Term, SenderName, SenderNode, Payload}
21-
).
18+
-define(RAFT_NAMED_RPC(Type, Term, SenderName, SenderNode, Payload), {rpc, Type, Term, SenderName, SenderNode, Payload}).
2219

2320
%% These two RPCs are used by RAFT catchup to receive the status of
2421
%% the RAFT server being sent to and should not change.
2522
-define(LEGACY_RAFT_RPC(Type, Term, SenderId, Payload), {rpc, Type, Term, SenderId, Payload}).
2623
-define(LEGACY_APPEND_ENTRIES_RESPONSE_RPC(Term, SenderId, PrevLogIndex, Success, LastIndex),
27-
?LEGACY_RAFT_RPC(append_entries_response, Term, SenderId, {PrevLogIndex, Success, LastIndex})
28-
).
24+
?LEGACY_RAFT_RPC(append_entries_response, Term, SenderId, {PrevLogIndex, Success, LastIndex})).
2925

3026
%%-------------------------------------------------------------------
3127
%% RAFT Server Procedures
@@ -34,31 +30,23 @@
3430
%% procedures listed below.
3531
%%-------------------------------------------------------------------
3632

37-
-define(APPEND_ENTRIES, append_entries).
33+
-define(APPEND_ENTRIES, append_entries).
3834
-define(APPEND_ENTRIES_RESPONSE, append_entries_response).
39-
-define(REQUEST_VOTE, request_vote).
40-
-define(VOTE, vote).
41-
-define(HANDOVER, handover).
42-
-define(HANDOVER_FAILED, handover_failed).
43-
-define(NOTIFY_TERM, notify_term).
35+
-define(REQUEST_VOTE, request_vote).
36+
-define(VOTE, vote).
37+
-define(HANDOVER, handover).
38+
-define(HANDOVER_FAILED, handover_failed).
39+
-define(NOTIFY_TERM, notify_term).
4440

4541
%% Definitions of each of the standard procedures.
4642
-define(PROCEDURE(Type, Payload), {procedure, Type, Payload}).
47-
-define(APPEND_ENTRIES(PrevLogIndex, PrevLogTerm, Entries, CommitIndex, TrimIndex),
48-
?PROCEDURE(?APPEND_ENTRIES, {PrevLogIndex, PrevLogTerm, Entries, CommitIndex, TrimIndex})
49-
).
50-
-define(APPEND_ENTRIES_RESPONSE(PrevLogIndex, Success, MatchIndex, LastAppliedIndex),
51-
?PROCEDURE(?APPEND_ENTRIES_RESPONSE, {PrevLogIndex, Success, MatchIndex, LastAppliedIndex})
52-
).
53-
-define(REQUEST_VOTE(ElectionType, LastLogIndex, LastLogTerm),
54-
?PROCEDURE(?REQUEST_VOTE, {ElectionType, LastLogIndex, LastLogTerm})
55-
).
56-
-define(VOTE(Vote), ?PROCEDURE(?VOTE, {Vote})).
57-
-define(HANDOVER(Ref, PrevLogIndex, PrevLogTerm, Entries),
58-
?PROCEDURE(?HANDOVER, {Ref, PrevLogIndex, PrevLogTerm, Entries})
59-
).
60-
-define(HANDOVER_FAILED(Ref), ?PROCEDURE(?HANDOVER_FAILED, {Ref})).
61-
-define(NOTIFY_TERM(), ?PROCEDURE(?NOTIFY_TERM, {})).
43+
-define(APPEND_ENTRIES(PrevLogIndex, PrevLogTerm, Entries, CommitIndex, TrimIndex), ?PROCEDURE(?APPEND_ENTRIES, {PrevLogIndex, PrevLogTerm, Entries, CommitIndex, TrimIndex})).
44+
-define(APPEND_ENTRIES_RESPONSE(PrevLogIndex, Success, MatchIndex, LastAppliedIndex), ?PROCEDURE(?APPEND_ENTRIES_RESPONSE, {PrevLogIndex, Success, MatchIndex, LastAppliedIndex})).
45+
-define(REQUEST_VOTE(ElectionType, LastLogIndex, LastLogTerm), ?PROCEDURE(?REQUEST_VOTE, {ElectionType, LastLogIndex, LastLogTerm})).
46+
-define(VOTE(Vote), ?PROCEDURE(?VOTE, {Vote})).
47+
-define(HANDOVER(Ref, PrevLogIndex, PrevLogTerm, Entries), ?PROCEDURE(?HANDOVER, {Ref, PrevLogIndex, PrevLogTerm, Entries})).
48+
-define(HANDOVER_FAILED(Ref), ?PROCEDURE(?HANDOVER_FAILED, {Ref})).
49+
-define(NOTIFY_TERM(), ?PROCEDURE(?NOTIFY_TERM, {})).
6250

6351
%% A request to execute a particular procedure. This request could
6452
%% have been issued locally or as a result of a remote procedure
@@ -86,26 +74,24 @@
8674

8775
-define(RAFT_COMMAND(Type, Payload), {command, Type, Payload}).
8876

89-
-define(COMMIT_COMMAND(Op), ?RAFT_COMMAND(commit, Op)).
90-
-define(READ_COMMAND(Op), ?RAFT_COMMAND(read, Op)).
77+
-define(COMMIT_COMMAND(Op), ?RAFT_COMMAND(commit, Op)).
78+
-define(READ_COMMAND(Op), ?RAFT_COMMAND(read, Op)).
9179

92-
-define(STATUS_COMMAND, ?RAFT_COMMAND(status, undefined)).
93-
-define(TRIGGER_ELECTION_COMMAND(TermOrOffset), ?RAFT_COMMAND(trigger_election, {TermOrOffset})).
94-
-define(PROMOTE_COMMAND(TermOrOffset, Force), ?RAFT_COMMAND(promote, {TermOrOffset, Force})).
95-
-define(RESIGN_COMMAND, ?RAFT_COMMAND(resign, undefined)).
80+
-define(STATUS_COMMAND, ?RAFT_COMMAND(status, undefined)).
81+
-define(TRIGGER_ELECTION_COMMAND(TermOrOffset), ?RAFT_COMMAND(trigger_election, {TermOrOffset})).
82+
-define(PROMOTE_COMMAND(TermOrOffset, Force), ?RAFT_COMMAND(promote, {TermOrOffset, Force})).
83+
-define(RESIGN_COMMAND, ?RAFT_COMMAND(resign, undefined)).
9684

97-
-define(ADJUST_MEMBERSHIP_COMMAND(Action, Peer, ConfigIndex),
98-
?RAFT_COMMAND(adjust_membership, {Action, Peer, ConfigIndex})
99-
).
85+
-define(ADJUST_MEMBERSHIP_COMMAND(Action, Peer, ConfigIndex), ?RAFT_COMMAND(adjust_membership, {Action, Peer, ConfigIndex})).
10086

101-
-define(SNAPSHOT_AVAILABLE_COMMAND(Root, Position), ?RAFT_COMMAND(snapshot_available, {Root, Position})).
87+
-define(SNAPSHOT_AVAILABLE_COMMAND(Root, Position), ?RAFT_COMMAND(snapshot_available, {Root, Position})).
10288

103-
-define(HANDOVER_CANDIDATES_COMMAND, ?RAFT_COMMAND(handover_candidates, undefined)).
104-
-define(HANDOVER_COMMAND(Peer), ?RAFT_COMMAND(handover, Peer)).
89+
-define(HANDOVER_CANDIDATES_COMMAND, ?RAFT_COMMAND(handover_candidates, undefined)).
90+
-define(HANDOVER_COMMAND(Peer), ?RAFT_COMMAND(handover, Peer)).
10591

106-
-define(ENABLE_COMMAND, ?RAFT_COMMAND(enable, undefined)).
107-
-define(DISABLE_COMMAND(Reason), ?RAFT_COMMAND(disable, Reason)).
92+
-define(ENABLE_COMMAND, ?RAFT_COMMAND(enable, undefined)).
93+
-define(DISABLE_COMMAND(Reason), ?RAFT_COMMAND(disable, Reason)).
10894

109-
-define(BOOTSTRAP_COMMAND(Position, Config, Data), ?RAFT_COMMAND(bootstrap, {Position, Config, Data})).
95+
-define(BOOTSTRAP_COMMAND(Position, Config, Data), ?RAFT_COMMAND(bootstrap, {Position, Config, Data})).
11096

111-
-define(NOTIFY_COMPLETE_COMMAND(), ?RAFT_COMMAND(notify_complete, undefined)).
97+
-define(NOTIFY_COMPLETE_COMMAND(), ?RAFT_COMMAND(notify_complete, undefined)).

src/wa_raft.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%% @format
21
%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
32
%%%
43
%%% This source code is licensed under the Apache 2.0 license found in

0 commit comments

Comments
 (0)