From dd7386a664cff92e52d3d991ecae118e7c094ff6 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 Feb 2017 12:54:03 +0100 Subject: Do do missingentries in merge backup. --- merge/src/merge_backup.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/merge/src/merge_backup.erl b/merge/src/merge_backup.erl index 0686e32..bf20f23 100644 --- a/merge/src/merge_backup.erl +++ b/merge/src/merge_backup.erl @@ -69,7 +69,9 @@ do_backup(NodeName, NodeAddress, Start, NTotal) -> N = min(NTotal, plopconfig:get_env(merge_backup_winsize, 1000)), Hashes = index:getrange(logorder, Start, Start + N - 1), ok = merge_util:sendlog(NodeAddress, Start, Hashes, plopconfig:get_env(merge_backup_sendlog_chunksize, 1000)), - ok = merge_util:sendentries(NodeAddress, Hashes, plopconfig:get_env(merge_backup_sendentries_chunksize, 100)), + {ok, HashesMissingEncoded} = merge_util:missingentries(NodeAddress), + HashesMissing = lists:map(fun base64:decode/1, HashesMissingEncoded), + ok = merge_util:sendentries(NodeAddress, HashesMissing, plopconfig:get_env(merge_backup_sendentries_chunksize, 100)), Size = Start + N, TreeHead = ht:root(Size - 1), ok = check_root(NodeAddress, Size, TreeHead), -- cgit v1.1