hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to NDB server state

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-24 14:15:56 +03:00
parent 810dc06d5c
commit 6aedcc085f
6 changed files with 54 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/core/internal/monitor.hh
View File

@ -28,28 +28,24 @@ static const MXS_ENUM_VALUE mxs_monitor_event_default_enum = {"all", ~0ULL};
static const MXS_ENUM_VALUE mxs_monitor_event_enum_values[] =
{
mxs_monitor_event_default_enum,
{"master_down", MASTER_DOWN_EVENT },
{"master_up", MASTER_UP_EVENT },
{"slave_down", SLAVE_DOWN_EVENT },
{"slave_up", SLAVE_UP_EVENT },
{"server_down", SERVER_DOWN_EVENT },
{"server_up", SERVER_UP_EVENT },
{"synced_down", SYNCED_DOWN_EVENT },
{"synced_up", SYNCED_UP_EVENT },
{"donor_down", DONOR_DOWN_EVENT },
{"donor_up", DONOR_UP_EVENT },
{"ndb_down", NDB_DOWN_EVENT },
{"ndb_up", NDB_UP_EVENT },
{"lost_master", LOST_MASTER_EVENT },
{"lost_slave", LOST_SLAVE_EVENT },
{"lost_synced", LOST_SYNCED_EVENT },
{"lost_donor", LOST_DONOR_EVENT },
{"lost_ndb", LOST_NDB_EVENT },
{"new_master", NEW_MASTER_EVENT },
{"new_slave", NEW_SLAVE_EVENT },
{"new_synced", NEW_SYNCED_EVENT },
{"new_donor", NEW_DONOR_EVENT },
{"new_ndb", NEW_NDB_EVENT },
{"master_down", MASTER_DOWN_EVENT},
{"master_up", MASTER_UP_EVENT},
{"slave_down", SLAVE_DOWN_EVENT},
{"slave_up", SLAVE_UP_EVENT},
{"server_down", SERVER_DOWN_EVENT},
{"server_up", SERVER_UP_EVENT},
{"synced_down", SYNCED_DOWN_EVENT},
{"synced_up", SYNCED_UP_EVENT},
{"donor_down", DONOR_DOWN_EVENT},
{"donor_up", DONOR_UP_EVENT},
{"lost_master", LOST_MASTER_EVENT},
{"lost_slave", LOST_SLAVE_EVENT},
{"lost_synced", LOST_SYNCED_EVENT},
{"lost_donor", LOST_DONOR_EVENT},
{"new_master", NEW_MASTER_EVENT},
{"new_slave", NEW_SLAVE_EVENT},
{"new_synced", NEW_SYNCED_EVENT},
{"new_donor", NEW_DONOR_EVENT},
{NULL}
};

26
server/core/monitor.cc
View File

@ -159,11 +159,11 @@ const char* monitor_state_to_string(monitor_state_t state)
}
/** Server type specific bits */
const uint64_t server_type_bits = SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED | SERVER_NDB;
const uint64_t server_type_bits = SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED;
/** All server bits */
const uint64_t all_server_bits = SERVER_RUNNING | SERVER_MAINT | SERVER_MASTER | SERVER_SLAVE
| SERVER_JOINED | SERVER_NDB;
| SERVER_JOINED;
const char journal_name[] = "monitor.dat";
const char journal_template[] = "%s/%s/%s";
@ -1226,12 +1226,7 @@ mxs_monitor_event_t MonitorServer::get_event_type() const
case UP_EVENT:
rval = (present & SERVER_MASTER) ? MASTER_UP_EVENT :
(present & SERVER_SLAVE) ? SLAVE_UP_EVENT :
(present
& SERVER_JOINED) ? SYNCED_UP_EVENT :
(present
& SERVER_NDB) ?
NDB_UP_EVENT
:
(present & SERVER_JOINED) ? SYNCED_UP_EVENT :
SERVER_UP_EVENT;
break;
@ -1239,10 +1234,6 @@ mxs_monitor_event_t MonitorServer::get_event_type() const
rval = (prev & SERVER_MASTER) ? MASTER_DOWN_EVENT :
(prev & SERVER_SLAVE) ? SLAVE_DOWN_EVENT :
(prev & SERVER_JOINED) ? SYNCED_DOWN_EVENT :
(prev
& SERVER_NDB) ?
NDB_DOWN_EVENT
:
SERVER_DOWN_EVENT;
break;
@ -1250,22 +1241,13 @@ mxs_monitor_event_t MonitorServer::get_event_type() const
rval = (prev & SERVER_MASTER) ? LOST_MASTER_EVENT :
(prev & SERVER_SLAVE) ? LOST_SLAVE_EVENT :
(prev & SERVER_JOINED) ? LOST_SYNCED_EVENT :
(prev
& SERVER_NDB) ?
LOST_NDB_EVENT
:
UNDEFINED_EVENT;
break;
case NEW_EVENT:
rval = (present & SERVER_MASTER) ? NEW_MASTER_EVENT :
(present & SERVER_SLAVE) ? NEW_SLAVE_EVENT :
(present
& SERVER_JOINED) ? NEW_SYNCED_EVENT :
(present
& SERVER_NDB) ?
NEW_NDB_EVENT
:
(present & SERVER_JOINED) ? NEW_SYNCED_EVENT :
UNDEFINED_EVENT;
break;

21
server/core/server.cc
View File

@ -643,7 +643,6 @@ string SERVER::status_to_string(uint64_t flags, int nConnections)
const string relay = "Relay Master";
const string slave = "Slave";
const string synced = "Synced";
const string ndb = "NDB";
const string slave_ext = "Slave of External Server";
const string sticky = "Master Stickiness";
const string auth_err = "Auth Error";
@ -683,7 +682,6 @@ string SERVER::status_to_string(uint64_t flags, int nConnections)
// The following Galera and Cluster bits may be combined with master/slave.
concatenate_if(status_is_joined(flags), synced);
concatenate_if(status_is_ndb(flags), ndb);
// May be combined with other MariaDB monitor flags.
concatenate_if(flags & SERVER_SLAVE_OF_EXT_MASTER, slave_ext);
@ -847,16 +845,15 @@ uint64_t SERVER::status_from_string(const char* str)
uint64_t bit;
} ServerBits[] =
{
{"running", SERVER_RUNNING },
{"master", SERVER_MASTER },
{"slave", SERVER_SLAVE },
{"synced", SERVER_JOINED },
{"ndb", SERVER_NDB },
{"maintenance", SERVER_MAINT },
{"maint", SERVER_MAINT },
{"stale", SERVER_WAS_MASTER },
{"drain", SERVER_DRAINING },
{NULL, 0 }
{"running", SERVER_RUNNING},
{"master", SERVER_MASTER},
{"slave", SERVER_SLAVE},
{"synced", SERVER_JOINED},
{"maintenance", SERVER_MAINT},
{"maint", SERVER_MAINT},
{"stale", SERVER_WAS_MASTER},
{"drain", SERVER_DRAINING},
{NULL, 0}
};
for (int i = 0; ServerBits[i].str; i++)

7
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -137,15 +137,10 @@ bool RCR::configure(MXS_CONFIG_PARAMETER* params)
bitmask |= (SERVER_JOINED);
bitvalue |= SERVER_JOINED;
}
else if (!strcasecmp(opt.c_str(), "ndb"))
{
bitmask |= (SERVER_NDB);
bitvalue |= SERVER_NDB;
}
else
{
MXS_ERROR("Unsupported router option \'%s\' for readconnroute. "
"Expected router options are [slave|master|synced|ndb|running]",
"Expected router options are [slave|master|synced|running]",
opt.c_str());
ok = false;
}