bk commit into 5.1 tree (jonas:1.2632)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-18 15:18:40+02:00, jonas@stripped +1 -0
  ndb - micro gcp
    1) Dont block micro GCP until GCP_SAVE_IDLE
    2) If starting node is blocking GCP too long, kill it (instead of self)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-09-18 15:18:38+02:00,
jonas@stripped +23 -12
    1) Dont block micro GCP until GCP_SAVE_IDLE
    2) If starting node is blocking GCP too long, kill it (instead of self)

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-09-17 10:28:40 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-09-18 15:18:38 +02:00
@@ -7984,21 +7984,11 @@ Dbdih::execUPGRADE_PROTOCOL_ORD(Signal* 
 void
 Dbdih::startGcpLab(Signal* signal, Uint32 aWaitTime) 
 {
-  if (c_nodeStartMaster.blockGcp == true)
+  if (c_nodeStartMaster.blockGcp == true &&
+      m_gcp_save.m_master.m_state == GcpSave::GCP_SAVE_IDLE)
   {
     jam();
 
-    /**
-     * Also wait for GCP save...
-     */
-    if (m_gcp_save.m_master.m_state != GcpSave::GCP_SAVE_IDLE)
-    {
-      jam();
-      signal->theData[0] = DihContinueB::ZSTART_GCP;
-      sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 10, 1);
-      return;
-    }
-    
     /* ------------------------------------------------------------------ */
     /*  A NEW NODE WANTS IN AND WE MUST ALLOW IT TO COME IN NOW SINCE THE */
     /*       GCP IS COMPLETED.                                            */
@@ -11788,8 +11778,29 @@ void Dbdih::checkGcpStopLab(Signal* sign
  */
 void Dbdih::crashSystemAtGcpStop(Signal* signal, bool local)
 {
+  m_gcp_monitor.m_gcp_save.m_counter = 0;
+  m_gcp_monitor.m_micro_gcp.m_counter = 0;
+
   if (local)
     goto dolocal;
+
+  if (c_nodeStartMaster.blockGcp)
+  {
+    jam();
+    /**
+     * Starting node...is delaying GCP to long...
+     *   kill it
+     */
+    SystemError * const sysErr = (SystemError*)&signal->theData[0];
+    sysErr->errorCode = SystemError::GCPStopDetected;
+    sysErr->errorRef = reference();
+    sysErr->data[0] = m_gcp_save.m_master.m_state;
+    sysErr->data[1] = cgcpOrderBlocked;
+    sysErr->data[2] = m_micro_gcp.m_master.m_state;
+    sendSignal(calcNdbCntrBlockRef(c_nodeStartMaster.startNode), 
+               GSN_SYSTEM_ERROR, signal, SystemError::SignalLength, JBA);
+    return;
+  }
 
   if (m_gcp_monitor.m_gcp_save.m_counter == m_gcp_monitor.m_gcp_save.m_max_lag)
   {