mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb: fix assertion code in event code during cluster shutdown

Browse source
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2006-05-10 13:33:17 +02:00
parent 30c569f8fe
commit e17a28ed50
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file

@ -1519,30 +1519,18 @@ NdbEventBuffer::completeClusterFailed()
{
NdbEventOperationImpl* impl= &op->m_impl;
data.senderData = impl->m_oid;
insertDataL(impl, &data, ptr);
insertDataL(impl, &data, ptr);
} while((op = m_ndb->getEventOperation(op)));
/**
* Find min not completed GCI
* Release all GCI's with m_gci > gci
*/
Uint32 i;
Uint32 sz= m_active_gci.size();
Uint64 gci= ~0;
Uint64 gci= data.gci;
Gci_container* bucket = 0;
Gci_container* array = (Gci_container*)m_active_gci.getBase();
for(i = 0; i < sz; i++)
{
if(array[i].m_gcp_complete_rep_count && array[i].m_gci < gci)
{
bucket= array + i;
gci = bucket->m_gci;
}
}
/**
* Release all GCI's with m_gci > gci
*/
for(i = 0; i < sz; i++)
{
Gci_container* tmp = array + i;
if (tmp->m_gci > gci)
@ -1554,9 +1542,31 @@ NdbEventBuffer::completeClusterFailed()
tmp->~Gci_container();
bzero(tmp, sizeof(Gci_container));
}
else if (tmp->m_gcp_complete_rep_count)
{
if (tmp->m_gci == gci)
{
bucket= tmp;
continue;
}
// we have found an old not-completed gci
// something is wrong, assert in debug, but try so salvage
// in release
ndbout_c("out of order bucket detected at cluster disconnect, "
"data.gci: %u. tmp->m_gci: %u",
(unsigned)data.gci, (unsigned)tmp->m_gci);
assert(false);
if(!tmp->m_data.is_empty())
{
free_list(tmp->m_data);
}
tmp->~Gci_container();
bzero(tmp, sizeof(Gci_container));
}
}
assert(bucket != 0 && data.gci == gci);
assert(bucket != 0);
const Uint32 cnt= bucket->m_gcp_complete_rep_count = 1;
bucket->m_gci = gci;
bucket->m_gcp_complete_rep_count = cnt;