Commit 95e37a4a authored by unknown's avatar unknown

ndb - ps_7ndb as discovered by pb

  fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close
parent 05348e41
...@@ -1550,7 +1550,10 @@ NdbScanOperation::close_impl(TransporterFacade* tp, bool forceSend){ ...@@ -1550,7 +1550,10 @@ NdbScanOperation::close_impl(TransporterFacade* tp, bool forceSend){
* If no receiver is outstanding... * If no receiver is outstanding...
* set it to 1 as execCLOSE_SCAN_REP resets it * set it to 1 as execCLOSE_SCAN_REP resets it
*/ */
m_sent_receivers_count = m_sent_receivers_count ? m_sent_receivers_count : 1; if (m_sent_receivers_count < theParallelism)
m_sent_receivers_count++;
else
m_conf_receivers_count++;
while(theError.code == 0 && (m_sent_receivers_count + m_conf_receivers_count)) while(theError.code == 0 && (m_sent_receivers_count + m_conf_receivers_count))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment