samba.git/ctdb/tools, branch master

ctdb-tools: Remove some helper variables

2026-02-25T12:33:39+00:00

Remove CTDB_EVENT_HELPER, CTDB_LVS_HELPER, CTDB_NATGW_HELPER.  Use
path_helperdir_append() instead.

Signed-off-by: Martin Schwenke 
Reviewed-by: Anoop C S

ctdb-tools: Fix CID 1681637 - Drop unnecessary if-statements

2026-02-23T08:43:29+00:00

The first was found by Coverity:

>>>     CID 1681637:         Incorrect expression  (IDENTICAL_BRANCHES)
>>>     The same code is executed when the condition "ret != 0" is
	true or false, because the code in the if-then branch and
	after the if statement is identical. Should the if statement
	be removed?

The second and third are also obvious.

Sorry, missed these in review.

Signed-off-by: Martin Schwenke 
Signed-off-by: Anoop C S 

Autobuild-User(master): Anoop C S 
Autobuild-Date(master): Mon Feb 23 08:43:29 UTC 2026 on atb-devel-224

ctdb-tools: add --json support to 'version' sub-command

2026-02-20T00:47:32+00:00

When building ctdb with json-outpuit support, enable json output when
running 'ctdb version --json'. This may be used as indication to json
support in other sub-commands.

Pair-Programmed-With: John Mulligan 
Signed-off-by: Shachar Sharon 
Signed-off-by: John Mulligan 
Reviewed-by: Martin Schwenke 
Reviewed-by: Anoop C S

ctdb-tools: add a --json option for ctdb status

2026-02-20T00:47:32+00:00

Add a new --json option that prints JSON as a higher-level machine
parse-able output. The --json option is only supported if the
jansson library is available.

The --json option will ONLY print json.  If the subcommand does not
(yet) support json it will raise an error rather than fall back to
emitting human readable text. This way a json parser is never given
"invalid" input.

Pair-Programmed-With: Shachar Sharon 
Signed-off-by: Shachar Sharon 
Signed-off-by: John Mulligan 
Reviewed-by: Martin Schwenke 
Reviewed-by: Anoop C S

ctdb-tools: reformat ctdb.c with clang-format

2026-02-20T00:47:32+00:00

This is the result of running:
    clang-format -i ctdb/tools/ctdb.c

This is in preparation for some upcoming changes that add fields to the
struct tables and general recommendations to use `clang-format` and/or
`git clang-format` to keep samba code formatted consistently.

Signed-off-by: John Mulligan 
Reviewed-by: Martin Schwenke 
Reviewed-by: Anoop C S

ctdb-scripts: Only send notifies for newly taken IPs

2026-02-18T11:13:40+00:00

We no longer delete shared state (and send notifies) for
IPs previously held by the current node. The NFS lock manager
won't have released locks for these IPs, so won't generate
SM_MON on reclaim attempts.  Therefore, there will be
no add-client to put them back.

We now record newly taken IP addresses in takeip,
and only send notifies for those during
ipreallocated.  The extra notifies were also confusing
statd.

Update existing tests to always simulate taking all of a node's IPs.
This causes no output changes.

Test updates confirm the subtleties of the statd_callout_helper
behaviour change.  These pretend to only take a single IP, so
SM_NOTIFY must not be sent for other IPs.  Shared state should
remain for these other files.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15939

Signed-off-by: Peter Schwenke 
Signed-off-by: Martin Schwenke 
Reviewed-by: Anoop C S

ctdb-scripts: Move NFS lock manager grace hack to callout

2026-02-09T11:17:41+00:00

The "startipreallocate" event was added so the NFS-Ganesha callout
could use it to start grace.  Use it for Linux kernel lock manager
grace too.

Signed-off-by: Martin Schwenke 
Reviewed-by: Volker Lendecke

ctdb-scripts: Reformat with "shfmt -w -p -i 0 -fn"

2025-03-29T11:34:41+00:00

Best reviewed with "git show -w".

Signed-off-by: Martin Schwenke 
Reviewed-by: Ralph Boehme

ctdb-scripts: Add ctdb_diagnostics -l option

2025-03-29T11:34:41+00:00

Allows ctdb_diagnostics to be run on the local node without onnode.

Signed-off-by: yogita72 
Reviewed-by: Martin Schwenke 
Reviewed-by: Ralph Boehme

remove usage of bzero

2025-01-02T17:01:30+00:00

bzero() function has been deprecated for a long time.
In samba it is replaced with memset().  But samba also
provides common memory-zeroing macros, like ZERO_STRUCT().
In all places where bzero() is used, it actually meant to
zero a structure or an array.

So replace these bzero() calls with ZERO_STRUCT() or
ZERO_ARRAY() as appropriate, and remove bzero() replacement
and testing entirely.

While at it, also stop checking for presence of memset() -
this function is standard for a very long time, and the
only conditional where HAVE_MEMSET were used, was to
provide replacement for bzero() - in all other places
memset() is used unconditionally.

Signed-off-by: Michael Tokarev 
Reviewed-by: Andreas Schneider 
Reviewed-by: Pavel Filipenský