The branch, master has been updated via cd0df26bdc7 WHATSNEW: Add CTDB updates for 4.11 via 753874b38fd ctdb-tools: CID 1449530 - Negative loop bound via c5803507df7 ctdb-config: depend on /etc/ctdb/nodes file from a0561c7ed44 ctdb-tests: Rename local-daemon.sh dump-logs to print-log
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit cd0df26bdc71175b69e11acd5750721ba6cf67e8 Author: Martin Schwenke <mar...@meltin.net> Date: Thu Jun 27 20:41:57 2019 +1000 WHATSNEW: Add CTDB updates for 4.11 Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Fri Jul 5 08:05:00 UTC 2019 on sn-devel-184 commit 753874b38fddc05357635e13c8ce26d319b0d77f Author: Martin Schwenke <mar...@meltin.net> Date: Wed Jul 3 20:58:54 2019 +1000 ctdb-tools: CID 1449530 - Negative loop bound Regression introduced by commit 2558f96da1f9be8034f26736c8050bb38a1f82a8. count should be signed because list_of_connected_nodes() returns -1 on failure. Variable i is used in both signed and unsigned contexts, so add new signed variable j for use in signed context. Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> commit c5803507df7def388edcd5b6cbfee30cd217b536 Author: Rafael David Tinoco <rafaeldtin...@ubuntu.com> Date: Thu Jun 27 20:12:25 2019 +0000 ctdb-config: depend on /etc/ctdb/nodes file BUG: https://bugzilla.samba.org/show_bug.cgi?id=14017 CTDB should start as a disabled unit (systemd) in most of the distributions and, when trying to enable it for the first time, user should get an unconfigured, or similar, error. Depending on /etc/ctdb/nodes file will give a clear direction to final user on what is needed in order to get cluster up and running. It should work like previous ENABLED=NO variables in SySV like initialization scripts. Signed-off-by: Rafael David Tinoco <rafaeldtin...@ubuntu.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 24 ++++++++++++++++++++++++ ctdb/config/ctdb.service | 1 + ctdb/tools/ctdb.c | 10 ++++++---- 3 files changed, 31 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 286798cc289..360fe5614ca 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -198,6 +198,30 @@ Improvements have been made to Samba's handling of subtree renames, for example of containers and organisational units, however large renames are still not recommended. +CTDB changes +============ + +* nfs-linux-kernel-callout now defaults to using systemd service names + + The Red Hat service names continue to be the default. + + Other distributions should patch this file when packaging it. + +* The onnode -o option has been removed + +* ctdbd logs when it is using more than 90% of a CPU thread + + ctdbd is single threaded, so can become saturated if it uses the + full capacity of a CPU thread. To help detect this situation, ctdbd + now logs messages when CPU utilisation exceeds 90%. Each change in + CPU utilisation over 90% is logged. A message is also logged when + CPU utilisation drops below the 90% threshold. + +* Script configuration variable CTDB_MONITOR_SWAP_USAGE has been removed + + 05.system.script now monitors total memory (i.e. physical memory + + swap) utilisation using the existing CTDB_MONITOR_MEMORY_USAGE + script configuration variable. REMOVED FEATURES diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service index 675b3147417..fd81c38e26d 100644 --- a/ctdb/config/ctdb.service +++ b/ctdb/config/ctdb.service @@ -2,6 +2,7 @@ Description=CTDB Documentation=man:ctdbd(1) man:ctdb(7) After=network-online.target time-sync.target +ConditionFileNotEmpty=/etc/ctdb/nodes [Service] Type=forking diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 9d46c981a0f..2cc72eedc76 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -3657,7 +3657,8 @@ static int control_reloadnodes(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, struct ctdb_req_control request; struct ctdb_reply_control **reply; bool reload; - unsigned int i, count; + unsigned int i; + int count; int ret; uint32_t *pnn_list; @@ -3726,13 +3727,14 @@ static int control_reloadnodes(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, &request, NULL, &reply); if (ret != 0) { bool failed = false; + int j; - for (i=0; i<count; i++) { - ret = ctdb_reply_control_reload_nodes_file(reply[i]); + for (j=0; j<count; j++) { + ret = ctdb_reply_control_reload_nodes_file(reply[j]); if (ret != 0) { fprintf(stderr, "Node %u failed to reload nodes\n", - pnn_list[i]); + pnn_list[j]); failed = true; } } -- Samba Shared Repository