You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-07 03:22:57 +03:00
fix(messageqcpp): MCOL-5636 same node communication crashes transmiting PP errors to EM b/c error messaging leveraged socket that was a nullptr.
This commit is contained in:
@@ -153,7 +153,7 @@ int BPPSeeder::operator()()
|
||||
|
||||
if (0 < status)
|
||||
{
|
||||
sendErrorMsg(uniqueID, status, stepID);
|
||||
error_handling::sendErrorMsg(status, uniqueID, stepID, sock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -335,23 +335,8 @@ void BPPSeeder::catchHandler(const string& ex, uint32_t id, uint32_t step)
|
||||
{
|
||||
Logger log;
|
||||
log.logMessage(ex);
|
||||
sendErrorMsg(id, logging::bppSeederErr, step);
|
||||
}
|
||||
|
||||
void BPPSeeder::sendErrorMsg(uint32_t id, uint16_t status, uint32_t step)
|
||||
{
|
||||
ISMPacketHeader ism;
|
||||
PrimitiveHeader ph = {0, 0, 0, 0, 0, 0};
|
||||
|
||||
ism.Status = status;
|
||||
ph.UniqueID = id;
|
||||
ph.StepID = step;
|
||||
ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
|
||||
msg.append((uint8_t*)&ism, sizeof(ism));
|
||||
msg.append((uint8_t*)&ph, sizeof(ph));
|
||||
|
||||
boost::mutex::scoped_lock lk(*writelock);
|
||||
sock->write(msg);
|
||||
error_handling::sendErrorMsg(logging::bppSeederErr, id, step, sock);
|
||||
}
|
||||
|
||||
bool BPPSeeder::isSysCat()
|
||||
|
Reference in New Issue
Block a user