From a712846b4022d6e3d41d9ea8c60fd32b6126e26c Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 Feb 2017 11:51:18 +0100 Subject: Move frontend_nodes for primary merge to plopconfig. Also make it contain node names too. --- tools/compileconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/compileconfig.py b/tools/compileconfig.py index 9169639..f3f34df 100755 --- a/tools/compileconfig.py +++ b/tools/compileconfig.py @@ -369,7 +369,7 @@ def gen_config(nodename, config, localconfig): reloadableplopconfig.append((Symbol("merge_backup_winsize"), 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"])) - plopconfig.append((Symbol("frontend_nodes"), frontendnodeaddresses)) + reloadableplopconfig.append((Symbol("frontend_nodes"), zip(frontendnodenames, frontendnodeaddresses))) reloadableplopconfig.append((Symbol("merge_secondaries"), zip(mergesecondarynames, mergesecondaryaddresses))) plopconfig.append((Symbol("sth_path"), paths["mergedb"] + "/sth")) plopconfig.append((Symbol("fetched_path"), paths["mergedb"] + "/fetched")) -- cgit v1.1