summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-08 17:00:45 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-08 17:00:45 +0100
commit116d1d725aad42a585ef71306762ec61a1298838 (patch)
treecac66761c46225fd8c00de9ebad6153334431e4f
parent9f3fce20f1f3e07b11163a4d7f6a6596fffa7705 (diff)
Cap merge dist and backup window sizes to 50k entries.erlmerge2
compileconfig limits window sizes to 50k silently. 50k is 50% of the current max number of entries returned by "missingentries". This limit can be lifted once CATLFISH-90 has been implemented.
-rwxr-xr-xtools/compileconfig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index 1ac5249..fd77b90 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -365,10 +365,10 @@ def gen_config(nodename, config, localconfig):
merge = localconfig["merge"]
plopconfig.append((Symbol("db_backend_opt"), [(Symbol("write_flag"), Symbol("read"))]))
plopconfig.append((Symbol("merge_delay"), merge["min-delay"]))
- plopconfig.append((Symbol("merge_dist_winsize"), merge["dist-window-size"]))
+ plopconfig.append((Symbol("merge_dist_winsize"), min(50000, merge["dist-window-size"])))
plopconfig.append((Symbol("merge_dist_sendlog_chunksize"), merge["dist-sendlog-chunksize"]))
plopconfig.append((Symbol("merge_dist_sendentries_chunksize"), merge["dist-sendentries-chunksize"]))
- reloadableplopconfig.append((Symbol("merge_backup_winsize"), merge["backup-window-size"]))
+ reloadableplopconfig.append((Symbol("merge_backup_winsize"), min(50000, merge["backup-window-size"])))
reloadableplopconfig.append((Symbol("merge_backup_sendlog_chunksize"), merge["backup-sendlog-chunksize"]))
reloadableplopconfig.append((Symbol("merge_backup_sendentries_chunksize"), merge["backup-sendentries-chunksize"]))
reloadableplopconfig.append((Symbol("frontend_nodes"), zip(frontendnodenames, frontendnodeaddresses)))