bk commit into 5.1 tree (jonas:1.2103) BUG#25801

[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-03-05 15:45:38+01:00, jonas@stripped +5 -0
  ndb - wl2325-5.0
    Bug #25801 Internal error if starting partially with missing REDO

  storage/ndb/include/mgmapi/ndbd_exit_codes.h@stripped, 2007-03-05 15:45:37+01:00,
jonas@stripped +2 -0
    Bug #25801 Internal error if starting partially with missing REDO

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-03-05 15:45:37+01:00,
jonas@stripped +53 -6
    Bug #25801 Internal error if starting partially with missing REDO

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp@stripped, 2007-03-05 15:45:37+01:00,
jonas@stripped +1 -0
    Bug #25801 Internal error if starting partially with missing REDO

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@stripped, 2007-03-05 15:45:37+01:00,
jonas@stripped +84 -23
    Bug #25801 Internal error if starting partially with missing REDO

  storage/ndb/src/kernel/error/ndbd_exit_codes.c@stripped, 2007-03-05 15:45:37+01:00,
jonas@stripped +2 -0
    Bug #25801 Internal error if starting partially with missing REDO

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop5

--- 1.55/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-05 15:45:42 +01:00
+++ 1.56/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-05 15:45:42 +01:00
@@ -1163,11 +1163,58 @@
 void Dbdih::execDIH_RESTARTREQ(Signal* signal) 
 {
   jamEntry();
-  cntrlblockref = signal->theData[0];
-  if(theConfiguration.getInitialStart()){
-    sendSignal(cntrlblockref, GSN_DIH_RESTARTREF, signal, 1, JBB);
-  } else {
-    readGciFileLab(signal);
+  if (signal->theData[0])
+  {
+    jam();
+    cntrlblockref = signal->theData[0];
+    if(theConfiguration.getInitialStart()){
+      sendSignal(cntrlblockref, GSN_DIH_RESTARTREF, signal, 1, JBB);
+    } else {
+      readGciFileLab(signal);
+    }
+  }
+  else
+  {
+    /**
+     * Precondition, (not checked)
+     *   atleast 1 node in each node group
+     */
+    Uint32 i;
+    NdbNodeBitmask mask;
+    mask.assign(NdbNodeBitmask::Size, signal->theData + 1);
+    Uint32 *node_gcis = signal->theData+1+NdbNodeBitmask::Size;
+    Uint32 node_group_gcis[MAX_NDB_NODES+1];
+    bzero(node_group_gcis, sizeof(node_group_gcis));
+    for (i = 0; i<MAX_NDB_NODES; i++)
+    {
+      if (mask.get(i))
+      {
+	jam();
+	Uint32 ng = Sysfile::getNodeGroup(i, SYSFILE->nodeGroups);
+	ndbrequire(ng < MAX_NDB_NODES);
+	Uint32 gci = node_gcis[i];
+	if (gci > node_group_gcis[ng])
+	{
+	  jam();
+	  node_group_gcis[ng] = gci;
+	}
+      }
+    }
+    for (i = 0; i<MAX_NDB_NODES && node_group_gcis[i] == 0; i++);
+    
+    Uint32 gci = node_group_gcis[i];
+    for (i++ ; i<MAX_NDB_NODES; i++)
+    {
+      jam();
+      if (node_group_gcis[i] && node_group_gcis[i] != gci)
+      {
+	jam();
+	signal->theData[0] = i;
+	return;
+      }
+    }
+    signal->theData[0] = MAX_NDB_NODES;
+    return;
   }
   return;
 }//Dbdih::execDIH_RESTARTREQ()
@@ -11998,7 +12045,7 @@
 	(buf, sizeof(buf), 
 	 "Illegal initial start, no alive node in nodegroup %u", i);
       progError(__LINE__, 
-		NDBD_EXIT_SR_RESTARTCONFLICT,
+		NDBD_EXIT_INSUFFICENT_NODES,
 		buf);
       
     }

--- 1.16/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2007-03-05 15:45:42 +01:00
+++ 1.17/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2007-03-05 15:45:42 +01:00
@@ -129,6 +129,7 @@
     Uint32 m_president_candidate_gci;
     Uint16 m_regReqReqSent;
     Uint16 m_regReqReqRecv;
+    Uint32 m_node_gci[MAX_NDB_NODES];
   } c_start;
   
   NdbNodeBitmask c_definedNodes; // DB nodes in config

--- 1.39/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-03-05 15:45:42 +01:00
+++ 1.40/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-03-05 15:45:42 +01:00
@@ -1058,7 +1058,8 @@
     jam();
     c_start.m_starting_nodes_w_log.set(TaddNodeno);
   }
-  
+  c_start.m_node_gci[TaddNodeno] = node_gci;
+
   skip_nodes.bitAND(c_definedNodes);
   c_start.m_skip_nodes.bitOR(skip_nodes);
   
@@ -1194,6 +1195,7 @@
   wait.bitANDC(tmp);
 
   Uint32 retVal = 0;
+  Uint32 incompleteng = MAX_NDB_NODES; // Illegal value
   NdbNodeBitmask report_mask;
 
   if ((c_start.m_latest_gci == 0) || 
@@ -1218,6 +1220,7 @@
       goto start_report;
     }
   }
+
   {
     const bool all = c_start.m_starting_nodes.equal(c_definedNodes);
     CheckNodeGroups* sd = (CheckNodeGroups*)&signal->theData[0];
@@ -1279,7 +1282,7 @@
         report_mask.assign(c_definedNodes);
         report_mask.bitANDC(c_start.m_starting_nodes);
         retVal = 1;
-        goto start_report;
+        goto check_log;
       case CheckNodeGroups::Partitioning:
         ndbrequire(result != CheckNodeGroups::Lose);
         signal->theData[1] = 
@@ -1287,7 +1290,7 @@
         report_mask.assign(c_definedNodes);
         report_mask.bitANDC(c_start.m_starting_nodes);
         retVal = 1;
-        goto start_report;
+        goto check_log;
       }
     }
 
@@ -1311,12 +1314,7 @@
     case CheckNodeGroups::Partitioning:
       if (now < partitioned_timeout && result != CheckNodeGroups::Win)
       {
-        signal->theData[1] = c_restartPartionedTimeout == ~0 ? 4 : 5;
-        signal->theData[2] = Uint32((partitioned_timeout - now + 500) / 1000);
-        report_mask.assign(c_definedNodes);
-        report_mask.bitANDC(c_start.m_starting_nodes);
-        retVal = 0;
-        goto start_report;
+        goto missinglog;
       }
       // Fall through...
     case CheckNodeGroups::Win:
@@ -1324,12 +1322,61 @@
         all ? 0x8001 : (result == CheckNodeGroups::Win ? 0x8002 : 0x8003);
       report_mask.assign(c_definedNodes);
       report_mask.bitANDC(c_start.m_starting_nodes);
-      retVal = 1;
-      goto start_report;
+      retVal = 2;
+      goto check_log;
     }
   }
   ndbrequire(false);
 
+check_log:
+  jam();
+  {
+    Uint32 save[4+4*NdbNodeBitmask::Size];
+    memcpy(save, signal->theData, sizeof(save));
+    
+    signal->theData[0] = 0;
+    c_start.m_starting_nodes.copyto(NdbNodeBitmask::Size, signal->theData+1);
+    memcpy(signal->theData+1+NdbNodeBitmask::Size, c_start.m_node_gci,
+	   4*MAX_NDB_NODES);
+    EXECUTE_DIRECT(DBDIH, GSN_DIH_RESTARTREQ, signal, 
+		   1+NdbNodeBitmask::Size+MAX_NDB_NODES);
+    
+    incompleteng = signal->theData[0];
+    memcpy(signal->theData, save, sizeof(save));
+
+    if (incompleteng != MAX_NDB_NODES)
+    {
+      jam();
+      if (retVal == 1)
+      {
+	jam();
+	goto incomplete_log;
+      }
+      else if (retVal == 2)
+      {
+	if (now <= partitioned_timeout)
+	{
+	  jam();
+	  goto missinglog;
+	}
+	else
+	{
+	  goto incomplete_log;
+	}
+      }
+      ndbrequire(false);
+    }
+  }
+  goto start_report;
+
+missinglog:
+  signal->theData[1] = c_restartPartionedTimeout == (Uint32) ~0 ? 4 : 5;
+  signal->theData[2] = Uint32((partitioned_timeout - now + 500) / 1000);
+  report_mask.assign(c_definedNodes);
+  report_mask.bitANDC(c_start.m_starting_nodes);
+  retVal = 0;
+  goto start_report;
+  
 start_report:
   jam();
   {
@@ -1347,18 +1394,32 @@
   return retVal;
   
 missing_nodegroup:
-  jam();
-  char buf[100], mask1[100], mask2[100];
-  c_start.m_starting_nodes.getText(mask1);
-  tmp.assign(c_start.m_starting_nodes);
-  tmp.bitANDC(c_start.m_starting_nodes_w_log);
-  tmp.getText(mask2);
-  BaseString::snprintf(buf, sizeof(buf),
-		       "Unable to start missing node group! "
-		       " starting: %s (missing fs for: %s)",
-		       mask1, mask2);
-  progError(__LINE__, NDBD_EXIT_SR_RESTARTCONFLICT, buf);
-  return 0; // remove warning
+ {
+   char buf[100], mask1[100], mask2[100];
+   c_start.m_starting_nodes.getText(mask1);
+   tmp.assign(c_start.m_starting_nodes);
+   tmp.bitANDC(c_start.m_starting_nodes_w_log);
+   tmp.getText(mask2);
+   BaseString::snprintf(buf, sizeof(buf),
+			"Unable to start missing node group! "
+			" starting: %s (missing fs for: %s)",
+			mask1, mask2);
+   progError(__LINE__, NDBD_EXIT_INSUFFICENT_NODES, buf);
+   return 0;                                     // Deadcode
+ }
+
+incomplete_log:
+ jam();
+ {
+   char buf[100], mask1[100];
+   c_start.m_starting_nodes.getText(mask1);
+   BaseString::snprintf(buf, sizeof(buf),
+			 "Incomplete log for node group: %d! "
+			 " starting nodes: %s",
+			incompleteng, mask1);
+   progError(__LINE__, NDBD_EXIT_INSUFFICENT_NODES, buf);
+   return 0;                                     // Deadcode
+ }
 }
 
 void

--- 1.9/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2007-03-05 15:45:42 +01:00
+++ 1.10/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2007-03-05 15:45:42 +01:00
@@ -138,6 +138,8 @@
 #define NDBD_EXIT_AFS_NO_SUCH_FILE          2815
 #define NDBD_EXIT_AFS_READ_UNDERFLOW        2816
 
+#define NDBD_EXIT_INSUFFICENT_NODES         2353
+
 const char *
 ndbd_exit_message(int faultId, ndbd_exit_classification *cl);
 const char *

--- 1.7/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2007-03-05 15:45:42 +01:00
+++ 1.8/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2007-03-05 15:45:42 +01:00
@@ -145,6 +145,8 @@
    {NDBD_EXIT_AFS_NO_SUCH_FILE          , XFI, "File not found"},
    {NDBD_EXIT_AFS_READ_UNDERFLOW        , XFI, "Read underflow"},
 
+   {NDBD_EXIT_INSUFFICENT_NODES, XRE, "Insufficent nodes for system restart" },
+   
    /* Sentinel */
    {0, XUE,
     "No message slogan found (please report a bug if you get this error code)"}