sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

ctdb-config: [legacy] recmaster capability -> [cluster] leader capability

Browse Source 
Rename this configuration item and move it into the [cluster]
configuration section.

Update documentation to match.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2022-01-10 14:15:25 +11:00 committed by Martin Schwenke
parent f5a39058f0
commit 1dfb266038
12 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/cluster/cluster_conf.c
View File

@ -155,4 +155,9 @@ void cluster_conf_init(struct conf_context *conf)
CLUSTER_CONF_RECOVERY_LOCK,
NULL,
validate_recovery_lock);
conf_define_boolean(conf,
CLUSTER_CONF_SECTION,
CLUSTER_CONF_LEADER_CAPABILITY,
true,
NULL);
}

1
ctdb/cluster/cluster_conf.h
View File

@ -28,6 +28,7 @@
#define CLUSTER_CONF_NODE_ADDRESS "node address"
#define CLUSTER_CONF_CLUSTER_LOCK "cluster lock"
#define CLUSTER_CONF_RECOVERY_LOCK "recovery lock"
#define CLUSTER_CONF_LEADER_CAPABILITY "leader capability"
void cluster_conf_init(struct conf_context *conf);

12
ctdb/doc/ctdb.7.xml
View File

@ -478,11 +478,11 @@ Node 3:/usr/local/etc/ctdb/public_addresses
<variablelist>
<varlistentry>
<term>RECMASTER</term>
<term>LEADER</term>
<listitem>
<para>
Indicates that a node can become the CTDB cluster recovery
master. The current recovery master is decided via an
Indicates that a node can become the CTDB cluster leader.
The current leader is decided via an
election held by all active nodes with this capability.
</para>
<para>
@ -508,7 +508,7 @@ Node 3:/usr/local/etc/ctdb/public_addresses
</variablelist>
<para>
The RECMASTER and LMASTER capabilities can be disabled when CTDB
The LEADER and LMASTER capabilities can be disabled when CTDB
is used to create a cluster spanning across WAN links. In this
case CTDB acts as a WAN accelerator.
</para>
@ -1088,13 +1088,13 @@ correct CIFS semantics to clients.
<screen format="linespecific">
[legacy]
lmaster capability = false
recmaster capability = false
leader capability = false
</screen>
</para>
<para>
Verify with the command "ctdb getcapabilities" that that node no longer
has the recmaster or the lmaster capabilities.
has the leader or the lmaster capabilities.
</para>
</refsect1>

48
ctdb/doc/ctdb.conf.5.xml
View File

@ -194,6 +194,30 @@
</listitem>
</varlistentry>
<varlistentry>
<term>leader capability = true|false</term>
<listitem>
<para>
Indicates whether a node can become the leader
for the cluster. If this is set to
<literal>false</literal> then the node will not be able to
become the leader for the cluster. This feature
is primarily used for making a cluster span across a WAN
link and use CTDB as a WAN-accelerator.
</para>
<para>
Please see the <citetitle>REMOTE CLUSTER NODES</citetitle>
section in
<citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> for more
information.
</para>
<para>
Default: <literal>true</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>node address = <parameter>IPADDR</parameter></term>
<listitem>
@ -497,30 +521,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>recmaster capability = true|false</term>
<listitem>
<para>
Indicates whether a node can become the recovery master
for the cluster. If this is set to
<literal>false</literal> then the node will not be able to
become the recovery master for the cluster. This feature
is primarily used for making a cluster span across a WAN
link and use CTDB as a WAN-accelerator.
</para>
<para>
Please see the <citetitle>REMOTE CLUSTER NODES</citetitle>
section in
<citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> for more
information.
</para>
<para>
Default: <literal>true</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>lmaster capability = true|false</term>
<listitem>

8
ctdb/server/ctdb_config.c
View File

@ -57,6 +57,10 @@ static void setup_config_pointers(struct conf_context *conf)
CLUSTER_CONF_SECTION,
CLUSTER_CONF_RECOVERY_LOCK,
&ctdb_config.recovery_lock);
conf_assign_boolean_pointer(conf,
CLUSTER_CONF_SECTION,
CLUSTER_CONF_LEADER_CAPABILITY,
&ctdb_config.leader_capability);
/*
* Database
@ -107,10 +111,6 @@ static void setup_config_pointers(struct conf_context *conf)
LEGACY_CONF_SECTION,
LEGACY_CONF_REALTIME_SCHEDULING,
&ctdb_config.realtime_scheduling);
conf_assign_boolean_pointer(conf,
LEGACY_CONF_SECTION,
LEGACY_CONF_RECMASTER_CAPABILITY,
&ctdb_config.recmaster_capability);
conf_assign_boolean_pointer(conf,
LEGACY_CONF_SECTION,
LEGACY_CONF_LMASTER_CAPABILITY,

2
ctdb/server/ctdb_config.h
View File

@ -28,6 +28,7 @@ struct ctdb_config {
const char *node_address;
const char *cluster_lock;
const char *recovery_lock;
bool leader_capability;
/* Database */
const char *dbdir_volatile;
@ -44,7 +45,6 @@ struct ctdb_config {
/* Legacy */
bool realtime_scheduling;
bool recmaster_capability;
bool lmaster_capability;
bool start_as_stopped;
bool start_as_disabled;

2
ctdb/server/ctdbd.c
View File

@ -358,7 +358,7 @@ int main(int argc, const char *argv[])
if (!ctdb_config.lmaster_capability) {
ctdb->capabilities &= ~CTDB_CAP_LMASTER;
}
if (!ctdb_config.recmaster_capability) {
if (!ctdb_config.leader_capability) {
ctdb->capabilities &= ~CTDB_CAP_RECMASTER;
}

5
ctdb/server/legacy_conf.c
View File

@ -57,11 +57,6 @@ void legacy_conf_init(struct conf_context *conf)
LEGACY_CONF_REALTIME_SCHEDULING,
true,
NULL);
conf_define_boolean(conf,
LEGACY_CONF_SECTION,
LEGACY_CONF_RECMASTER_CAPABILITY,
true,
NULL);
conf_define_boolean(conf,
LEGACY_CONF_SECTION,
LEGACY_CONF_LMASTER_CAPABILITY,

1
ctdb/server/legacy_conf.h
View File

@ -25,7 +25,6 @@
#define LEGACY_CONF_SECTION "legacy"
#define LEGACY_CONF_REALTIME_SCHEDULING "realtime scheduling"
#define LEGACY_CONF_RECMASTER_CAPABILITY "recmaster capability"
#define LEGACY_CONF_LMASTER_CAPABILITY "lmaster capability"
#define LEGACY_CONF_START_AS_STOPPED "start as stopped"
#define LEGACY_CONF_START_AS_DISABLED "start as disabled"

2
ctdb/tests/UNIT/cunit/config_test_001.sh
View File

@ -36,6 +36,7 @@ ok <<EOF
# node address =
# cluster lock =
# recovery lock =
# leader capability = true
[database]
# volatile database directory = ${database_volatile_dbdir}
# persistent database directory = ${database_persistent_dbdir}
@ -48,7 +49,6 @@ ok <<EOF
# disabled = false
[legacy]
# realtime scheduling = true
# recmaster capability = true
# lmaster capability = true
# start as stopped = false
# start as disabled = false

14
ctdb/tests/UNIT/cunit/config_test_004.sh
View File

@ -31,6 +31,11 @@ ok <<EOF
EOF
unit_test ctdb-config get "cluster" "cluster lock"
ok <<EOF
true
EOF
unit_test ctdb-config get "cluster" "leader capability"
cat > "$conffile" <<EOF
[cluster]
transport = invalid
@ -91,3 +96,12 @@ required_result 0 <<EOF
Configuration option [cluster] -> recovery lock is deprecated
EOF
unit_test ctdb-config -d WARNING validate
cat > "$conffile" <<EOF
[cluster]
leader capability = false
EOF
required_result 0 <<EOF
EOF
unit_test ctdb-config validate

5
ctdb/tests/UNIT/cunit/config_test_006.sh
View File

@ -23,11 +23,6 @@ true
EOF
unit_test ctdb-config get "legacy" "realtime scheduling"
ok <<EOF
true
EOF
unit_test ctdb-config get "legacy" "recmaster capability"
ok <<EOF
true
EOF