[SCM] Samba Shared Repository - branch master updated
Amitay Isaacs
amitay at samba.org
Mon Aug 17 06:14:02 UTC 2020
The branch, master has been updated
via 0cb61c6fb6a ctdb-doc: Link to CTDB page in wiki
via 8baf47916a2 WHATSNEW: Document removal of "ctdb isnotrecmaster" command
via 971c20e9dc2 ctdb-tools: Drop "ctdb isnotrecmaster" command
from e89ec78e9a2 util: Add cmocka unit test for directory_create_or_exists
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0cb61c6fb6a11836dfd35e5e45858ea395b13087
Author: Martin Schwenke <martin at meltin.net>
Date: Sat Aug 8 21:05:55 2020 +1000
ctdb-doc: Link to CTDB page in wiki
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Mon Aug 17 06:13:11 UTC 2020 on sn-devel-184
commit 8baf47916a24deda23787662f44f872ea8d427ec
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 7 12:21:33 2020 +1000
WHATSNEW: Document removal of "ctdb isnotrecmaster" command
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 971c20e9dc264c076b3fdfbeda71e4430919e7e4
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 7 12:19:09 2020 +1000
ctdb-tools: Drop "ctdb isnotrecmaster" command
This isn't used anywhere and can easily be checked via "ctdb pnn" and
"ctdb recmaster" commands.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 4 +++
ctdb/doc/ctdb.1.xml | 2 +-
ctdb/doc/ctdb.7.xml | 8 ++++++
.../simple/cluster.001.isnotrecmaster.sh | 28 ---------------------
ctdb/tools/ctdb.c | 29 ----------------------
5 files changed, 13 insertions(+), 58 deletions(-)
delete mode 100755 ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 206ee6ad20d..7c155d89a39 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -29,6 +29,10 @@ CTDB CHANGES
"follower-only" (from "slave-only"). Identical changes were made
for LVS.
+* Remove "ctdb isnotrecmaster" command. It isn't used by CTDB's
+ scripts and can be checked by users with "ctdb pnn" and "ctdb
+ recmaster".
+
REMOVED FEATURES
================
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 217a6d3e41a..e0e05d8e542 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -1816,7 +1816,7 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/usr/local/var/li
</refsect1>
<!-- UNDOCUMENTED: stats
- isnotrecmaster addtickle deltickle
+ addtickle deltickle
tfetch tstore readkey writekey
checktcpport getdbseqnum
-->
diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml
index 7fd61af0964..274d12c7002 100644
--- a/ctdb/doc/ctdb.7.xml
+++ b/ctdb/doc/ctdb.7.xml
@@ -57,6 +57,12 @@
high-availablity (HA) environment for services such as clustered
Samba, NFS and other services.
</para>
+
+ <para>
+ In addition to the CTDB manual pages there is much more
+ information available at
+ <ulink url="https://wiki.samba.org/index.php/CTDB_and_Clustered_Samba"/>.
+ </para>
</refsect1>
<refsect1>
@@ -1115,6 +1121,8 @@ correct CIFS semantics to clients.
<citerefentry><refentrytitle>ctdb-tunables</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>,
+ <ulink url="https://wiki.samba.org/index.php/CTDB_and_Clustered_Samba"/>,
+
<ulink url="http://ctdb.samba.org/"/>
</para>
</refsect1>
diff --git a/ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh b/ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh
deleted file mode 100755
index 7d8620bc2f5..00000000000
--- a/ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Verify the operation of 'ctdb isnotrecmaster'
-
-. "${TEST_SCRIPTS_DIR}/integration.bash"
-
-set -e
-
-ctdb_test_init
-
-cmd="$CTDB isnotrecmaster || true"
-try_command_on_node -v all "$cmd"
-
-num_all_lines=$(wc -l <"$outfile")
-num_rm_lines=$(grep -Fc 'this node is the recmaster' "$outfile") || true
-num_not_rm_lines=$(grep -Fc 'this node is not the recmaster' "$outfile") || true
-
-if [ $num_rm_lines -eq 1 ] ; then
- echo "OK, there is only 1 recmaster"
-else
- die "BAD, there are ${num_rm_lines} nodes claiming to be the recmaster"
-fi
-
-if [ $(($num_all_lines - $num_not_rm_lines)) -eq 1 ] ; then
- echo "OK, all the other nodes claim not to be the recmaster"
-else
- die "BAD, there are only ${num_not_rm_lines} notrecmaster nodes"
-fi
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 5209081f322..e21d2d4b562 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2997,33 +2997,6 @@ static int control_ipreallocate(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
return ipreallocate(mem_ctx, ctdb);
}
-static int control_isnotrecmaster(TALLOC_CTX *mem_ctx,
- struct ctdb_context *ctdb,
- int argc, const char **argv)
-{
- uint32_t recmaster;
- int ret;
-
- if (argc != 0) {
- usage("isnotrecmaster");
- }
-
- ret = ctdb_ctrl_get_recmaster(mem_ctx, ctdb->ev, ctdb->client,
- ctdb->pnn, TIMEOUT(), &recmaster);
- if (ret != 0) {
- fprintf(stderr, "Failed to get recmaster\n");
- return ret;
- }
-
- if (recmaster != ctdb->pnn) {
- printf("this node is not the recmaster\n");
- return 1;
- }
-
- printf("this node is the recmaster\n");
- return 0;
-}
-
static int control_gratarp(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
int argc, const char **argv)
{
@@ -5990,8 +5963,6 @@ static const struct ctdb_cmd {
"run ip reallocation (deprecated)", NULL },
{ "ipreallocate", control_ipreallocate, false, true,
"run ip reallocation", NULL },
- { "isnotrecmaster", control_isnotrecmaster, false, false,
- "check if local node is the recmaster", NULL },
{ "gratarp", control_gratarp, false, true,
"send a gratuitous arp", "<ip> <interface>" },
{ "tickle", control_tickle, true, false,
--
Samba Shared Repository
More information about the samba-cvs
mailing list