diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-10-28 21:17:47 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-11-20 01:36:31 +0100 |
| commit | 837483c8d3f8c44f9709074932a9dd7ebfac90ce (patch) | |
| tree | 2d46013afcb518ab00a0490e96403f6a4725e5ef /ctdb/tests/src/ctdb_takeover_tests.c | |
| parent | cc1637b17c9ae89bcc00d95f9cdfd00f67c88bc3 (diff) | |
| download | samba-837483c8d3f8c44f9709074932a9dd7ebfac90ce.tar.gz | |
ctdb-ipalloc: Move IP list creation out to ctdb_takeover_run()
For various reasons create_merged_ip_list() needs a CTDB context.
This is difficult to resolve now for a few reasons, including:
* The ip_tree needs somewhere to live.
It isn't very useful in its current form. However, in the future
real remote IP monitoring will probably be added back, so leave it
around.
* It uses node flags from the ctdb_node structure.
This could be changed by putting a node map into ipalloc_state
and referencing that.
For now, it is easier to move it out to where there will be a CTDB
context available for the forseeable future. ctdb_takeover_run() will
need one as long as the current client interface is used.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/src/ctdb_takeover_tests.c')
| -rw-r--r-- | ctdb/tests/src/ctdb_takeover_tests.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c index 8a9938280db..936f641aaee 100644 --- a/ctdb/tests/src/ctdb_takeover_tests.c +++ b/ctdb/tests/src/ctdb_takeover_tests.c @@ -603,7 +603,9 @@ static void ctdb_test_ctdb_takeover_run_core(const char nodestates[], ctdb_test_init(nodestates, &ctdb, &all_ips, &ipflags, read_ips_for_multiple_nodes); - ctdb_takeover_run_core(ctdb, ipflags, &all_ips, NULL); + all_ips = create_merged_ip_list(ctdb); + + ctdb_takeover_run_core(ctdb, ipflags, all_ips, NULL); print_ctdb_public_ip_list(all_ips); |