Commit 32026612 authored by unknown's avatar unknown

Bug#25239 Out of memory problem can cause crash in SUMA


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  return RNIL instead of ndbrequire if memory allocation fails
parent 7c9da59b
...@@ -4668,9 +4668,7 @@ Suma::out_of_buffer(Signal* signal) ...@@ -4668,9 +4668,7 @@ Suma::out_of_buffer(Signal* signal)
m_out_of_buffer_gci = m_last_complete_gci - 1; m_out_of_buffer_gci = m_last_complete_gci - 1;
infoEvent("Out of event buffer: nodefailure will cause event failures"); infoEvent("Out of event buffer: nodefailure will cause event failures");
signal->theData[0] = SumaContinueB::OUT_OF_BUFFER_RELEASE; out_of_buffer_release(signal, 0);
signal->theData[1] = 0;
sendSignal(SUMA_REF, GSN_CONTINUEB, signal, 2, JBB);
} }
void void
...@@ -4738,7 +4736,8 @@ Suma::seize_page() ...@@ -4738,7 +4736,8 @@ Suma::seize_page()
Uint32 count; Uint32 count;
m_tup->allocConsPages(16, count, ref); m_tup->allocConsPages(16, count, ref);
ndbrequire(count > 0); if (count == 0)
return RNIL;
ndbout_c("alloc_chunk(%d %d) - ", ref, count); ndbout_c("alloc_chunk(%d %d) - ", ref, 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