bk commit into 5.1 tree (pekka:1.2614)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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-08-28 12:49:50+03:00, pekka@stripped +18 -0
  Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-t61
  into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-t62-merge
  MERGE: 1.2403.16.171

  cluster_change_hist.txt@stripped, 2007-08-28 12:39:43+03:00, pekka@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.25

  configure.in@stripped, 2007-08-28 12:41:25+03:00, pekka@stripped +0 -2
    use local
    MERGE: 1.420.8.17

  sql/ha_ndbcluster.cc@stripped, 2007-08-28 12:39:43+03:00, pekka@stripped +0 -0
    Auto merged
    MERGE: 1.397.7.14

  sql/log_event.cc@stripped, 2007-08-28 12:42:01+03:00, pekka@stripped +0 -1
    use local (only change is expanded comment)
    MERGE: 1.263.3.2

  storage/ndb/include/transporter/TransporterRegistry.hpp@stripped, 2007-08-28 12:43:22+03:00,
pekka@stripped +0 -27
    MAX_NODES
    MERGE: 1.25.1.1

  storage/ndb/src/common/transporter/TCP_Transporter.cpp@stripped, 2007-08-28 12:46:20+03:00,
pekka@stripped +1 -5
    overload pct to 80
    MERGE: 1.14.2.1

  storage/ndb/src/common/transporter/TCP_Transporter.hpp@stripped, 2007-08-28 12:39:43+03:00,
pekka@stripped +0 -15
    Auto merged
    MERGE: 1.8.2.3

  storage/ndb/src/common/transporter/Transporter.hpp@stripped, 2007-08-28 12:39:43+03:00,
pekka@stripped +0 -4
    Auto merged
    MERGE: 1.16.1.1

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-08-28 12:48:21+03:00,
pekka@stripped +0 -3
    numbers
    MERGE: 1.32.1.8

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-08-28 12:39:43+03:00,
pekka@stripped +0 -0
    Auto merged
    MERGE: 1.101.1.18

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -4
    Auto merged
    MERGE: 1.57.2.9

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -42
    Auto merged
    MERGE: 1.134.2.23

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -0
    Auto merged
    MERGE: 1.133.2.5

  storage/ndb/src/kernel/blocks/suma/Suma.hpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -3
    Auto merged
    MERGE: 1.20.1.1

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -0
    Auto merged
    MERGE: 1.69.3.3

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -1
    Auto merged
    MERGE: 1.81.2.7

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-08-28 12:39:44+03:00,
pekka@stripped +0 -0
    Auto merged
    MERGE: 1.40.1.11

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-08-28 12:49:43+03:00,
pekka@stripped +15 -1
    manual
    MERGE: 1.66.1.16

# 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:	pekka
# Host:	sama.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my51-t62-merge/RESYNC

--- 1.25/cluster_change_hist.txt	2007-07-04 09:55:16 +03:00
+++ 1.26/cluster_change_hist.txt	2007-08-28 12:39:43 +03:00
@@ -53,7 +53,7 @@
 mysql-5.1.15-ndb-6.1.X
 ==================================================
 
-mysql-5.1.15-ndb-6.1.16 (not released)
+mysql-5.1.15-ndb-6.1.16 (2007-06-28)
 
   Bug #29331 Incorrect node killed on GCP Stop (COPY_GCI)
   Bug #29057 Incorrect handling of file 0 during redo execution(Error while reading REDO
log)

--- 1.120/storage/ndb/test/run-test/daily-basic-tests.txt	2007-07-11 15:38:00 +03:00
+++ 1.121/storage/ndb/test/run-test/daily-basic-tests.txt	2007-08-28 12:49:43 +03:00
@@ -553,6 +553,22 @@
 cmd: testNodeRestart
 args: -n Bug25554 T1
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug26457 T1
+
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug26481 T1
+
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug29364 T1
+
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug28023 T7 D2
+
 max-time: 3000
 cmd: testNodeRestart
 args: -n Bug25984

--- 1.27/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-08-06 12:20:08
+03:00
+++ 1.28/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-08-28 12:43:22
+03:00
@@ -356,7 +356,7 @@
 inline void
 TransporterRegistry::set_status_overloaded(Uint32 nodeId, bool val)
 {
-  assert(nodeId < (Uint32) MAX_NTRANSPORTERS);
+  assert(nodeId < MAX_NODES);
   m_status_overloaded.set(nodeId, val);
 }
 

--- 1.18/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2007-07-31 03:00:00 +03:00
+++ 1.19/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2007-08-28 12:46:20 +03:00
@@ -99,7 +99,7 @@
   setIf(sockOptSndBufSize, conf->tcp.tcpSndBufSize, 71540);
   setIf(sockOptTcpMaxSeg, conf->tcp.tcpMaxsegSize, 0);
 
-  overloadedPct = 90; // make configurable in next patch
+  overloadedPct = 80; // make configurable in next patch
 }
 
 TCP_Transporter::~TCP_Transporter() {

--- 1.137/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-07-31 03:00:00 +03:00
+++ 1.138/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-08-28 12:39:43 +03:00
@@ -756,6 +756,12 @@
     jam();
     return;
   }
+#ifdef GCP_TIMER_HACK
+  if (reason == CopyGCIReq::GLOBAL_CHECKPOINT) {
+    jam();
+    NdbTick_getMicroTimer(&globalData.gcp_timer_copygci[0]);
+  }
+#endif
 
   /* ----------------------------------------------------------------------- */
   /*     WE START BY TRYING TO OPEN THE FIRST RESTORABLE GCI FILE.           */
@@ -8177,7 +8183,9 @@
     sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 3000, 1);
     return;
   }
-  
+#ifdef GCP_TIMER_HACK
+  NdbTick_getMicroTimer(&globalData.gcp_timer_commit[0]);
+#endif
   GCPPrepareConf* conf = (GCPPrepareConf*)signal->getDataPtrSend();
   conf->nodeId = cownNodeId;
   conf->gci = gci;  
@@ -8231,6 +8239,10 @@
     return;
   }
 
+#ifdef GCP_TIMER_HACK
+  NdbTick_getMicroTimer(&globalData.gcp_timer_commit[1]);
+#endif
+
   cgcpParticipantState = GCP_PARTICIPANT_TC_FINISHED;
 
   GCPNodeFinished* conf = (GCPNodeFinished*)signal->getDataPtrSend();
@@ -8672,6 +8684,32 @@
     EXECUTE_DIRECT(LGMAN, GSN_SUB_GCP_COMPLETE_REP, signal, 
 		   SubGcpCompleteRep::SignalLength);
     jamEntry();
+
+#ifdef GCP_TIMER_HACK
+    NdbTick_getMicroTimer(&globalData.gcp_timer_copygci[1]);
+
+    // this is last timer point so we send local report here
+    {
+      const GlobalData& g = globalData;
+      Uint32 ms_commit = NdbTick_getMicrosPassed(
+          g.gcp_timer_commit[0], g.gcp_timer_commit[1]) / 1000;
+      Uint32 ms_save = NdbTick_getMicrosPassed(
+          g.gcp_timer_save[0], g.gcp_timer_save[1]) / 1000;
+      Uint32 ms_copygci = NdbTick_getMicrosPassed(
+          g.gcp_timer_copygci[0], g.gcp_timer_copygci[1]) / 1000;
+
+      Uint32 ms_total = ms_commit + ms_save + ms_copygci;
+
+      // random formula to report excessive duration
+      bool report =
+        g.gcp_timer_limit != 0 ?
+          (ms_total > g.gcp_timer_limit) :
+          (ms_total > 3000 * (1 + cgcpDelay / 1000));
+      if (report)
+        infoEvent("GCP %u ms: total:%u commit:%u save:%u copygci:%u",
+            coldgcp, ms_total, ms_commit, ms_save, ms_copygci);
+    }
+#endif
   }
   
   jam();
@@ -14631,6 +14669,11 @@
     jam();
     crashSystemAtGcpStop(signal, true);
   }
+
+#ifdef GCP_TIMER_HACK
+  if (signal->theData[0] == 7901)
+    globalData.gcp_timer_limit = signal->theData[1];
+#endif
 }//Dbdih::execDUMP_STATE_ORD()
 
 void

--- 1.186/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-07-31 03:00:00 +03:00
+++ 1.187/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-08-28 12:39:44 +03:00
@@ -12204,6 +12204,10 @@
     return;
   }
 
+#ifdef GCP_TIMER_HACK
+  NdbTick_getMicroTimer(&globalData.gcp_timer_save[0]);
+#endif
+
   ccurrentGcprec = 0;
   gcpPtr.i = ccurrentGcprec;
   ptrCheckGuard(gcpPtr, cgcprecFileSize, gcpRecord);
@@ -12425,6 +12429,11 @@
       return;
     }//if
   }//for
+
+#ifdef GCP_TIMER_HACK
+  NdbTick_getMicroTimer(&globalData.gcp_timer_save[1]);
+#endif
+
   GCPSaveConf * const saveConf = (GCPSaveConf *)&signal->theData[0];
   saveConf->dihPtr = localGcpPtr.p->gcpUserptr;
   saveConf->nodeId = getOwnNodeId();