diff options
author | Linus Nordberg <linus@nordu.net> | 2017-02-08 02:08:40 +0100 |
---|---|---|
committer | Linus Nordberg <linus@nordu.net> | 2017-02-08 02:08:40 +0100 |
commit | c5506779dac2d13ca407ae26f97ba6e6e85a6ad7 (patch) | |
tree | 28858be0ff31339249766804baed9a98c87714d7 /merge/src/merge_sth.erl | |
parent | ce28e5b6ce3adf400b17f34e006426b411332af4 (diff) |
merge_backup: Do not read logorder past what fetched indicates.
Diffstat (limited to 'merge/src/merge_sth.erl')
-rw-r--r-- | merge/src/merge_sth.erl | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/merge/src/merge_sth.erl b/merge/src/merge_sth.erl index a34179d..3dffaca 100644 --- a/merge/src/merge_sth.erl +++ b/merge/src/merge_sth.erl @@ -58,7 +58,7 @@ make_sth(CurSize, State) -> %% entry with the size found in the 'fetched' file, sort the list %% (highest tree size first) and index it with backup quorum to %% get our new tree size. - Sizes = [fetched() | verified_sizes(MergeSecondaryNames)], + Sizes = [merge_util:nfetched() | verified_sizes(MergeSecondaryNames)], BackupQuorumSize = plopconfig:get_env(backup_quorum, 0), true = BackupQuorumSize =< length(MergeSecondaryNames), NewSize = lists:nth(BackupQuorumSize + 1, Sizes), @@ -143,25 +143,6 @@ validate_tree_head(Treesize, Roothash) -> root_mismatch end. -fetched() -> - case read_fetched() of - {-1, _} -> - 0; - {Index, Hash} -> - ok = merge_util:verify_logorder_and_fetched_consistency(Index, Hash), - Index + 1 - end. - -read_fetched() -> % FIXME: merge with backup implementation - case merge_util:readfile(fetched_path) of - noentry -> - {-1, <<>>}; - {struct, PropList} -> - {proplists:get_value(<<"index">>, PropList), - proplists:get_value(<<"hash">>, PropList)} - end. - - read_sth_treesize() -> case plop:sth() of noentry -> |