database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Simplify PMS connection entries configuration

Browse Source
This commit is contained in:
Roman Nozdrin
2021-04-15 18:56:59 +00:00
parent 7e04032005
commit c9b353e975
3 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dbcon/joblist/distributedenginecomm.cpp
View File

@ -264,14 +264,25 @@ void DistributedEngineComm::Setup()
//This needs to make sense when compared to the extent size
// fLBIDShift = static_cast<unsigned>(config::Config::uFromText(fConfig->getConfig(section, "LBID_Shift")));
auto* config = fRm->getConfig();
std::vector<messageqcpp::AddrAndPortPair> pmsAddressesAndPorts;
for (size_t i = 1; i <= newPmCount; ++i)
{
std::string pmConfigNodeName("PMS");
pmConfigNodeName.append(std::to_string(i));
// The port returned by getAddressAndPort can be 0 but this will be handled by
// MessageQueueClient::connect
pmsAddressesAndPorts.push_back(messageqcpp::getAddressAndPort(config,
pmConfigNodeName));
}
// numConnections must be calculated as number of PMs * number of connections per PM.
// This happens earlier in getNumConnections().
for (unsigned i = 0; i < numConnections; i++)
{
ostringstream oss;
oss << "PMS" << (i + 1);
string fServer (oss.str());
boost::shared_ptr<MessageQueueClient>
cl(new MessageQueueClient(fServer, fRm->getConfig()));
size_t connectionId = numConnections % newPmCount;
boost::shared_ptr<MessageQueueClient> cl(new MessageQueueClient(pmsAddressesAndPorts[connectionId].first,
pmsAddressesAndPorts[connectionId].second));
boost::shared_ptr<boost::mutex> nl(new boost::mutex());
try
@ -286,7 +297,7 @@ void DistributedEngineComm::Setup()
}
else
{
throw runtime_error("Connection refused");
throw runtime_error("Connection refused from PMS" + std::to_string(connectionId));
}
}
catch (std::exception& ex)
@ -294,15 +305,15 @@ void DistributedEngineComm::Setup()
if (i < newPmCount)
newPmCount--;
writeToLog(__FILE__, __LINE__, "Could not connect to " + fServer + ": " + ex.what(), LOG_TYPE_ERROR);
cerr << "Could not connect to " << fServer << ": " << ex.what() << endl;
writeToLog(__FILE__, __LINE__, "Could not connect to PMS" + std::to_string(connectionId) + ": " + ex.what(), LOG_TYPE_ERROR);
cerr << "Could not connect to PMS" << std::to_string(connectionId) << ": " << ex.what() << endl;
}
catch (...)
{
if (i < newPmCount)
newPmCount--;
writeToLog(__FILE__, __LINE__, "Could not connect to " + fServer, LOG_TYPE_ERROR);
writeToLog(__FILE__, __LINE__, "Could not connect to PMS" + std::to_string(connectionId), LOG_TYPE_ERROR);
}
}