diff options
| author | Magnus Ahltorp <map@kth.se> | 2014-11-14 23:16:42 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2014-11-19 05:03:19 +0100 |
| commit | f8902f7899b4d76cabbf65763866d1a28fbcf743 (patch) | |
| tree | 34dc786c30f603041ce02113cbfe2f86e8c2b136 /src/plop.erl | |
| parent | ed641d942ce265bd12913713794cd2221b312733 (diff) | |
Remove support for internal merge
Diffstat (limited to 'src/plop.erl')
| -rw-r--r-- | src/plop.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plop.erl b/src/plop.erl index d363582..b1ad658 100644 --- a/src/plop.erl +++ b/src/plop.erl @@ -121,11 +121,13 @@ handle_http_reply(State, {storage_sendentry_http, {OwnRequestId}}, case RepliesUntilQuorum - 1 of 0 -> %% reached quorum + lager:debug("reached quorum"), gen_server:reply(From, ok), StateWithCompletion = Completion(State), {noreply, remove_own_request(StateWithCompletion, OwnRequestId)}; NewRepliesUntilQuorum -> + lager:debug("replies until quorum: ~p", [NewRepliesUntilQuorum]), {noreply, add_own_request(State, OwnRequestId, {storage_sendentry, {From, Completion, @@ -272,9 +274,7 @@ handle_call({add, {LogEntry, TreeLeafHash, EntryHash}}, From, Plop) -> lager:debug("add leafhash ~p", [TreeLeafHash]), case storage_nodes() of [] -> - ok = db:add(TreeLeafHash, EntryHash, LogEntry, ht:size()), - ok = ht:add(TreeLeafHash), - {reply, ok, Plop}; + exit(internal_merge_not_supported); Nodes -> {noreply, store_at_all_nodes(Nodes, {LogEntry, TreeLeafHash, EntryHash}, |