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

MXS-2220 Change server name to constant string

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-19 15:15:02 +02:00
parent 5fc2c1f49c
commit 40485d746c
37 changed files with 194 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlogrouter/blr.cc
View File

@ -1314,7 +1314,7 @@ static void closeSession(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_sessio
time(0) - router->connect_time,
router->stats.n_binlogs_ses);
MXS_ERROR("Binlog router close session with master server %s",
router->service->dbref->server->name);
router->service->dbref->server->name());
blr_master_reconnect(router);
return;
}

8
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -177,7 +177,7 @@ static void blr_start_master(void* data)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
router->retry_limit);
return;
}
@ -246,7 +246,7 @@ static void blr_start_master(void* data)
MXS_ERROR("%s: failure while connecting to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
connect_retry);
return;
}
@ -385,7 +385,7 @@ static void blr_restart_master(ROUTER_INSTANCE* router)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
router->retry_limit);
return;
}
@ -419,7 +419,7 @@ static void blr_restart_master(ROUTER_INSTANCE* router)
MXS_ERROR("%s: failed to connect to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
connect_retry);
}
else

12
server/modules/routing/debugcli/debugcmd.cc
View File

@ -962,13 +962,13 @@ static void cmd_AddServer(DCB* dcb, Server* server,
{
if (runtime_link_server(server, values[i]))
{
dcb_printf(dcb, "Added server '%s' to '%s'\n", server->name, values[i]);
dcb_printf(dcb, "Added server '%s' to '%s'\n", server->name(), values[i]);
}
else
{
dcb_printf(dcb,
"Could not add server '%s' to object '%s'. See error log for more details.\n",
server->name,
server->name(),
values[i]);
}
}
@ -1072,7 +1072,7 @@ static void cmd_RemoveServer(DCB* dcb, Server* server,
{
if (runtime_unlink_server(server, values[i]))
{
dcb_printf(dcb, "Removed server '%s' from '%s'\n", server->name, values[i]);
dcb_printf(dcb, "Removed server '%s' from '%s'\n", server->name(), values[i]);
}
else
{
@ -1388,8 +1388,8 @@ static void destroyServer(DCB* dcb, Server* server)
/** Do this so that we don't directly access the server. Currently, the
* destruction of a server does not free any memory and the server stays
* valid. */
char name[strlen(server->name) + 1];
strcpy(name, server->name);
char name[strlen(server->name()) + 1];
strcpy(name, server->name());
if (runtime_destroy_server(server))
{
@ -1566,7 +1566,7 @@ static void alterServer(DCB* dcb, Server* server,
dcb_printf(dcb,
"Enabling SSL for server '%s' failed, see log "
"for more details.\n",
server->name);
server->name());
}
}
else

4
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -197,7 +197,7 @@ Dcb HintRouter::connect_to_backend(MXS_SESSION* session,
HintRouterSession::BackendMap* all_backends)
{
Dcb result(NULL);
HR_DEBUG("Connecting to %s.", sref->server->name);
HR_DEBUG("Connecting to %s.", sref->server->name());
DCB* new_connection = dcb_connect(sref->server, session, sref->server->protocol);
if (new_connection)
@ -206,7 +206,7 @@ Dcb HintRouter::connect_to_backend(MXS_SESSION* session,
mxb::atomic::add(&sref->connections, 1, mxb::atomic::RELAXED);
result = Dcb(new_connection);
string name(new_connection->server->name);
string name(new_connection->server->name());
all_backends->insert(HintRouterSession::MapElement(name, result));
}
else

14
server/modules/routing/hintrouter/hintroutersession.cc
View File

@ -43,7 +43,7 @@ public:
if (pPacket)
{
SERVER* pServer = dcb.server();
HR_DEBUG("Writing packet to %p %s.", dcb.get(), pServer ? pServer->name : "(null)");
HR_DEBUG("Writing packet to %p %s.", dcb.get(), pServer ? pserver->name() : "(null)");
rv = dcb.write(pPacket);
}
return rv;
@ -138,13 +138,13 @@ void HintRouterSession::clientReply(GWBUF* pPacket, DCB* pBackend)
if (m_surplus_replies == 0)
{
HR_DEBUG("Returning packet from %s.", pServer ? pServer->name : "(null)");
HR_DEBUG("Returning packet from %s.", pServer ? pserver->name() : "(null)");
MXS_SESSION_ROUTE_REPLY(pBackend->session, pPacket);
}
else
{
HR_DEBUG("Ignoring reply packet from %s.", pServer ? pServer->name : "(null)");
HR_DEBUG("Ignoring reply packet from %s.", pServer ? pserver->name() : "(null)");
--m_surplus_replies;
gwbuf_free(pPacket);
@ -219,7 +219,7 @@ bool HintRouterSession::route_by_hint(GWBUF* pPacket, HINT* hint, bool print_err
if (master_ok)
{
HR_DEBUG("Writing packet to master: '%s'.", m_master.server()->name);
HR_DEBUG("Writing packet to master: '%s'.", m_master.server()->name());
success = m_master.write(pPacket);
if (success)
{
@ -247,7 +247,7 @@ bool HintRouterSession::route_by_hint(GWBUF* pPacket, HINT* hint, bool print_err
BackendMap::const_iterator iter = m_backends.find(backend_name);
if (iter != m_backends.end())
{
HR_DEBUG("Writing packet to %s.", iter->second.server()->name);
HR_DEBUG("Writing packet to %s.", iter->second.server()->name());
success = iter->second.write(pPacket);
if (success)
{
@ -319,7 +319,7 @@ bool HintRouterSession::route_to_slave(GWBUF* pPacket, bool print_errors)
Dcb& candidate = m_slaves.at(curr % size);
if (server_is_slave(candidate.server()))
{
HR_DEBUG("Writing packet to slave: '%s'.", candidate.server()->name);
HR_DEBUG("Writing packet to slave: '%s'.", candidate.server()->name());
success = candidate.write(pPacket);
if (success)
{
@ -347,7 +347,7 @@ bool HintRouterSession::route_to_slave(GWBUF* pPacket, bool print_errors)
for (size_type curr = begin; curr != limit; curr++)
{
Dcb& candidate = m_slaves.at(curr % size);
HR_DEBUG("Writing packet to slave: '%s'.", candidate.server()->name);
HR_DEBUG("Writing packet to slave: '%s'.", candidate.server()->name());
success = candidate.write(pPacket);
if (success)
{

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

@ -428,7 +428,7 @@ static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session
inst->stats.n_sessions++;
MXS_INFO("New session for server %s. Connections : %d",
candidate->server->name,
candidate->server->name(),
candidate->connections);
return reinterpret_cast<MXS_ROUTER_SESSION*>(client_rses);
@ -485,15 +485,15 @@ static void log_closed_session(mxs_mysql_cmd_t mysql_command, SERVER_REF* ref)
if (server_is_down(ref->server))
{
sprintf(msg, "Server '%s' is down.", ref->server->name);
sprintf(msg, "Server '%s' is down.", ref->server->name());
}
else if (server_is_in_maint(ref->server))
{
sprintf(msg, "Server '%s' is in maintenance.", ref->server->name);
sprintf(msg, "Server '%s' is in maintenance.", ref->server->name());
}
else
{
sprintf(msg, "Server '%s' no longer qualifies as a target server.", ref->server->name);
sprintf(msg, "Server '%s' no longer qualifies as a target server.", ref->server->name());
}
MXS_ERROR("Failed to route MySQL command %d to backend server. %s", mysql_command, msg);
@ -598,7 +598,7 @@ static int routeQuery(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session,
MXS_INFO("Routed [%s] to '%s'%s%s",
STRPACKETTYPE(mysql_command),
backend_dcb->server->name,
backend_dcb->server->name(),
trc ? ": " : ".",
trc ? trc : "");
MXS_FREE(trc);
@ -638,7 +638,7 @@ static void diagnostics(MXS_ROUTER* router, DCB* dcb)
{
dcb_printf(dcb,
"\t\t%-20s %3.1f%% %d\n",
ref->server->name,
ref->server->name(),
ref->server_weight * 100,
ref->connections);
}

6
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -347,7 +347,7 @@ void RWSplit::diagnostics(DCB* dcb)
{
dcb_printf(dcb,
"\t\t%-20s %3.1f%% %-6d %-6d %d\n",
ref->server->name,
ref->server->name(),
ref->server_weight * 100,
ref->server->stats.n_current,
ref->connections,
@ -368,7 +368,7 @@ void RWSplit::diagnostics(DCB* dcb)
dcb_printf(dcb,
" %10s %10ld %10ld %10ld %9s %10.02f%% %10ld\n",
s.first->name,
s.first->name(),
cs.total_queries,
cs.total_read_queries,
cs.total_write_queries,
@ -409,7 +409,7 @@ json_t* RWSplit::diagnostics_json() const
ServerStats::CurrentStats stats = a.second.current_stats();
json_t* obj = json_object();
json_object_set_new(obj, "id", json_string(a.first->name));
json_object_set_new(obj, "id", json_string(a.first->name()));
json_object_set_new(obj, "total", json_integer(stats.total_queries));
json_object_set_new(obj, "read", json_integer(stats.total_read_queries));
json_object_set_new(obj, "write", json_integer(stats.total_write_queries));

2
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -764,7 +764,7 @@ void check_and_log_backend_state(const RWBackend* backend, DCB* problem_dcb)
else
{
const char* remote = problem_dcb->state == DCB_STATE_POLLING
&& problem_dcb->server ? problem_dcb->server->name : "CLOSED";
&& problem_dcb->server ? problem_dcb->server->name() : "CLOSED";
MXS_ERROR("DCB connected to '%s' is not in use by the router "
"session, not closing it. DCB is in state '%s'",

64
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -393,7 +393,7 @@ int32_t SchemaRouterSession::routeQuery(GWBUF* pPacket)
{
MXS_INFO("INIT_DB for database '%s' on server '%s'",
m_current_db.c_str(),
target->name);
target->name());
route_target = TARGET_NAMED_SERVER;
}
else
@ -429,7 +429,7 @@ int32_t SchemaRouterSession::routeQuery(GWBUF* pPacket)
DCB* target_dcb = NULL;
if (TARGET_IS_NAMED_SERVER(route_target) && target
&& get_shard_dcb(&target_dcb, target->name))
&& get_shard_dcb(&target_dcb, target->name()))
{
/** We know where to route this query */
SSRBackend bref = get_bref_from_dcb(target_dcb);
@ -530,7 +530,7 @@ void SchemaRouterSession::process_sescmd_response(SSRBackend& bref, GWBUF** ppPa
mxs_mysql_extract_ps_response(*ppPacket, &resp);
MXS_INFO("ID: %lu HANDLE: %lu", (unsigned long)id, (unsigned long)resp.id);
m_shard.add_ps_handle(id, resp.id);
MXS_INFO("STMT SERVER: %s", bref->backend()->server->name);
MXS_INFO("STMT SERVER: %s", bref->backend()->server->name());
m_shard.add_statement(id, bref->backend()->server);
uint8_t* ptr = GWBUF_DATA(*ppPacket) + MYSQL_PS_ID_OFFSET;
gw_mysql_set_byte4(ptr, id);
@ -894,7 +894,7 @@ bool SchemaRouterSession::send_shards()
for (const auto& a : pContent)
{
set->add_row({a.first, a.second->name});
set->add_row({a.first, a.second->name()});
}
set->write(m_client);
@ -953,19 +953,19 @@ bool SchemaRouterSession::handle_default_db()
SSRBackend backend;
DCB* dcb = NULL;
if (get_shard_dcb(&dcb, target->name)
if (get_shard_dcb(&dcb, target->name())
&& (backend = get_bref_from_dcb(dcb)))
{
backend->write(buffer);
MXS_DEBUG("USE '%s' sent to %s for session %p",
m_connect_db.c_str(),
target->name,
target->name(),
m_client->session);
rval = true;
}
else
{
MXS_INFO("Couldn't find target DCB for '%s'.", target->name);
MXS_INFO("Couldn't find target DCB for '%s'.", target->name());
}
}
else
@ -1031,7 +1031,7 @@ int SchemaRouterSession::inspect_mapping_states(SSRBackend& bref,
{
(*it)->set_mapped(true);
MXS_DEBUG("Received SHOW DATABASES reply from %s for session %p",
(*it)->backend()->server->name,
(*it)->backend()->server->name(),
m_client->session);
}
else
@ -1086,7 +1086,7 @@ int SchemaRouterSession::inspect_mapping_states(SSRBackend& bref,
{
mapped = false;
MXS_DEBUG("Still waiting for reply to SHOW DATABASES from %s for session %p",
(*it)->backend()->server->name,
(*it)->backend()->server->name(),
m_client->session);
}
}
@ -1126,7 +1126,7 @@ bool change_current_db(std::string& dest, Shard& shard, GWBUF* buf)
if (target)
{
dest = db;
MXS_INFO("change_current_db: database is on server: '%s'.", target->name);
MXS_INFO("change_current_db: database is on server: '%s'.", target->name());
succp = true;
}
}
@ -1306,7 +1306,7 @@ enum showdb_response SchemaRouterSession::parse_mapping_response(SSRBackend& bre
{
if (m_shard.add_location(data, target))
{
MXS_INFO("<%s, %s>", target->name, data);
MXS_INFO("<%s, %s>", target->name(), data);
}
else
{
@ -1317,8 +1317,8 @@ enum showdb_response SchemaRouterSession::parse_mapping_response(SSRBackend& bre
MXS_ERROR("Table '%s' found on servers '%s' and '%s' for user %s@%s.",
data,
target->name,
duplicate->name,
target->name(),
duplicate->name(),
m_client->user,
m_client->remote);
}
@ -1327,8 +1327,8 @@ enum showdb_response SchemaRouterSession::parse_mapping_response(SSRBackend& bre
/** In conflict situations, use the preferred server */
MXS_INFO("Forcing location of '%s' from '%s' to '%s'",
data,
m_shard.get_location(data)->name,
target->name);
m_shard.get_location(data)->name(),
target->name());
m_shard.replace_location(data, target);
}
}
@ -1341,12 +1341,12 @@ enum showdb_response SchemaRouterSession::parse_mapping_response(SSRBackend& bre
{
n_eof++;
MXS_INFO("SHOW DATABASES fully received from %s.",
bref->backend()->server->name);
bref->backend()->server->name());
}
else
{
MXS_INFO("SHOW DATABASES partially received from %s.",
bref->backend()->server->name);
bref->backend()->server->name());
}
gwbuf_free(buf);
@ -1402,7 +1402,7 @@ void SchemaRouterSession::query_databases()
if (!(*it)->write(clone))
{
MXS_ERROR("Failed to write mapping query to '%s'",
(*it)->backend()->server->name);
(*it)->backend()->server->name());
}
}
}
@ -1441,12 +1441,12 @@ SERVER* SchemaRouterSession::get_shard_target(GWBUF* buffer, uint32_t qtype)
{
for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++)
{
char* srvnm = (*it)->backend()->server->name;
const char* srvnm = (*it)->backend()->server->name();
if (strcmp(srvnm, (char*)buffer->hint->data) == 0)
{
rval = (*it)->backend()->server;
MXS_INFO("Routing hint found (%s)", rval->name);
MXS_INFO("Routing hint found (%s)", rval->name());
}
}
}
@ -1463,7 +1463,7 @@ SERVER* SchemaRouterSession::get_shard_target(GWBUF* buffer, uint32_t qtype)
{
MXS_INFO("Using active database '%s' on '%s'",
m_current_db.c_str(),
rval->name);
rval->name());
}
}
return rval;
@ -1482,7 +1482,7 @@ SERVER* SchemaRouterSession::get_shard_target(GWBUF* buffer, uint32_t qtype)
*
* @return True if proper DCB was found, false otherwise.
*/
bool SchemaRouterSession::get_shard_dcb(DCB** p_dcb, char* name)
bool SchemaRouterSession::get_shard_dcb(DCB** p_dcb, const char* name)
{
bool succp = false;
mxb_assert(p_dcb != NULL && *(p_dcb) == NULL);
@ -1496,7 +1496,7 @@ bool SchemaRouterSession::get_shard_dcb(DCB** p_dcb, char* name)
* the backend state must be RUNNING
*/
if ((*it)->in_use()
&& (strncasecmp(name, b->server->name, PATH_MAX) == 0)
&& (strncasecmp(name, b->server->name(), PATH_MAX) == 0)
&& server_is_usable(b->server))
{
*p_dcb = (*it)->dcb();
@ -1706,15 +1706,15 @@ SERVER* SchemaRouterSession::get_query_target(GWBUF* buffer)
{
MXS_ERROR("Query targets tables on servers '%s' and '%s'. "
"Cross server queries are not supported.",
rval->name,
target->name);
rval->name(),
target->name());
}
else if (rval == NULL)
{
rval = target;
MXS_INFO("Query targets table '%s' on server '%s'",
tables[j],
rval->name);
rval->name());
}
}
}
@ -1754,8 +1754,8 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
{
MXS_ERROR("Statement targets tables on servers '%s' and '%s'. "
"Cross server queries are not supported.",
rval->name,
target->name);
rval->name(),
target->name());
}
else if (rval == NULL)
{
@ -1767,7 +1767,7 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
if (rval)
{
MXS_INFO("PREPARING NAMED %s ON SERVER %s", stmt, rval->name);
MXS_INFO("PREPARING NAMED %s ON SERVER %s", stmt, rval->name());
m_shard.add_statement(stmt, rval);
}
MXS_FREE(tables);
@ -1777,7 +1777,7 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
{
char* stmt = qc_get_prepare_name(buffer);
rval = m_shard.get_statement(stmt);
MXS_INFO("Executing named statement %s on server %s", stmt, rval->name);
MXS_INFO("Executing named statement %s on server %s", stmt, rval->name());
MXS_FREE(stmt);
}
else if (qc_query_is_type(qtype, QUERY_TYPE_DEALLOC_PREPARE))
@ -1786,7 +1786,7 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
if ((rval = m_shard.get_statement(stmt)))
{
MXS_INFO("Closing named statement %s on server %s", stmt, rval->name);
MXS_INFO("Closing named statement %s on server %s", stmt, rval->name());
m_shard.remove_statement(stmt);
}
MXS_FREE(stmt);
@ -1801,7 +1801,7 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
rval = m_shard.get_location(tables[0]);
MXS_FREE(tables[i]);
}
rval ? MXS_INFO("Prepare statement on server %s", rval->name) :
rval ? MXS_INFO("Prepare statement on server %s", rval->name()) :
MXS_INFO("Prepared statement targets no mapped tables");
MXS_FREE(tables);
}

2
server/modules/routing/schemarouter/schemaroutersession.hh
View File

@ -126,7 +126,7 @@ private:
/** Helper functions */
SERVER* get_shard_target(GWBUF* buffer, uint32_t qtype);
SSRBackend get_bref_from_dcb(DCB* dcb);
bool get_shard_dcb(DCB** dcb, char* name);
bool get_shard_dcb(DCB** dcb, const char* name);
bool have_servers();
bool handle_default_db();
bool ignore_duplicate_database(const char* data);

12
server/modules/routing/schemarouter/shard_map.cc
View File

@ -38,7 +38,7 @@ void Shard::add_statement(std::string stmt, SERVER* target)
void Shard::add_statement(uint32_t id, SERVER* target)
{
MXS_DEBUG("ADDING ID: [%u] server: [%s]", id, target->name);
MXS_DEBUG("ADDING ID: [%u] server: [%s]", id, target->name());
m_binary_map[id] = target;
}
@ -82,11 +82,11 @@ SERVER* Shard::get_location(std::string table)
{
if ((rval && rval != it->second))
{
MXS_DEBUG("There are 2 databases with same name on a different servers: '%s' and '%s'. Connecting to '%s'"
,
rval->name,
it->second->name,
rval->name);
MXS_DEBUG("There are 2 databases with same name on a different servers: '%s' and '%s'. "
"Connecting to '%s'",
rval->name(),
it->second->name(),
rval->name());
break;
}
else