sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

ctdb-daemon: Change handling of default capabilities

Browse Source 
Centrally define all the default capabilities to make the defaults
crystal clear.  Capability-related command-line options now have a
direct correspondence rather than a reverse correspondence.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Martin Schwenke 2015-10-08 20:25:20 +11:00 committed by Michael Adam
parent 5aab31a39a
commit dfc84fdd45
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/include/ctdb_protocol.h
View File

@ -594,8 +594,11 @@ struct ctdb_node_map {
*/ */
#define CTDB_CAP_PARALLEL_RECOVERY 0x00010000 #define CTDB_CAP_PARALLEL_RECOVERY 0x00010000
#define CTDB_CAP_DEFAULT (CTDB_CAP_PARALLEL_RECOVERY) #define CTDB_CAP_FEATURES (CTDB_CAP_PARALLEL_RECOVERY)
#define CTDB_CAP_DEFAULT (CTDB_CAP_RECMASTER | \
CTDB_CAP_LMASTER | \
CTDB_CAP_FEATURES)
struct ctdb_public_ip { struct ctdb_public_ip {
uint32_t pnn; uint32_t pnn;

8
ctdb/server/ctdbd.c
View File

@ -219,11 +219,11 @@ int main(int argc, const char *argv[])
/* set ctdbd capabilities */ /* set ctdbd capabilities */
ctdb->capabilities = CTDB_CAP_DEFAULT; ctdb->capabilities = CTDB_CAP_DEFAULT;
if (options.no_lmaster == 0) { if (options.no_lmaster != 0) {
ctdb->capabilities |= CTDB_CAP_LMASTER; ctdb->capabilities &= ~CTDB_CAP_LMASTER;
} }
if (options.no_recmaster == 0) { if (options.no_recmaster != 0) {
ctdb->capabilities |= CTDB_CAP_RECMASTER; ctdb->capabilities &= ~CTDB_CAP_RECMASTER;
} }
if (options.lvs != 0) { if (options.lvs != 0) {
ctdb->capabilities |= CTDB_CAP_LVS; ctdb->capabilities |= CTDB_CAP_LVS;