From: Jonas Oreland
Date: October 20 2010 9:50am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas:3880)
List-Archive: http://lists.mysql.com/commits/121274
Message-Id: <20101020095019.6A0BEB85B20@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6203541655930055621=="

--===============6203541655930055621==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 3880 Jonas Oreland	2010-10-20 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-10-20 07:12:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-10-20 09:49:55 +0000
@@ -14769,6 +14769,54 @@ bool Dbdih::findStartGci(ConstPtr<Replic
   return false;
 }//Dbdih::findStartGci()
 
+static
+Uint32
+count_db_nodes(ndb_mgm_configuration_iterator * iter)
+{
+  Uint32 cnt = 0;
+  for (ndb_mgm_first(iter); ndb_mgm_valid(iter); ndb_mgm_next(iter))
+  {
+    Uint32 nodeId = 0;
+    Uint32 type = ~Uint32(0);
+    if (ndb_mgm_get_int_parameter(iter, CFG_NODE_ID, &nodeId) == 0 &&
+        ndb_mgm_get_int_parameter(iter,CFG_TYPE_OF_SECTION, &type) == 0 &&
+        type == NodeInfo::DB)
+    {
+      cnt++;
+    }
+  }
+  return cnt;
+}
+
+/**
+ * Compute max time it can take to "resolve" cascading node-failures
+ *   given hb-interval, arbit timeout and #db-nodes
+ */
+static
+Uint32
+compute_max_failure_time(const ndb_mgm_configuration_iterator * p,
+                         ndb_mgm_configuration_iterator * cluster)
+{
+  Uint32 dbnodes = count_db_nodes(cluster);
+
+  Uint32 hbDBDB = 1500;
+  Uint32 arbitTimeout = 1000;
+  ndb_mgm_get_int_parameter(p, CFG_DB_HEARTBEAT_INTERVAL, &hbDBDB);
+  ndb_mgm_get_int_parameter(p, CFG_DB_ARBIT_TIMEOUT, &arbitTimeout);
+  
+  /*
+   * Max time for 1 node failure is
+   */
+  Uint32 max_time_one_failure = arbitTimeout + 4 * hbDBDB;
+  
+  /**
+   * And worst case...this can be cascading failure with all but self
+   */
+  Uint32 max_time_total_failure = (dbnodes - 1) * max_time_one_failure;
+
+  return max_time_total_failure;
+}
+
 void Dbdih::initCommonData()
 {
   c_blockCommit = false;
@@ -14841,19 +14889,25 @@ void Dbdih::initCommonData()
 	      "Only up to four replicas are supported. Check NoOfReplicas.");
   }
 
+  Uint32 max_failure_time = compute_max_failure_time
+    (p, m_ctx.m_config.getClusterConfigIterator());
+  
   bzero(&m_gcp_save, sizeof(m_gcp_save));
   bzero(&m_micro_gcp, sizeof(m_micro_gcp));
   {
-    Uint32 tmp = 2000;
-    ndb_mgm_get_int_parameter(p, CFG_DB_GCP_INTERVAL, &tmp);
-    tmp = tmp > 60000 ? 60000 : (tmp < 10 ? 10 : tmp);
-    m_gcp_save.m_master.m_time_between_gcp = tmp;
-
+    { // Set time-between global checkpoint
+      Uint32 tmp = 2000;
+      ndb_mgm_get_int_parameter(p, CFG_DB_GCP_INTERVAL, &tmp);
+      tmp = tmp > 60000 ? 60000 : (tmp < 10 ? 10 : tmp);
+      m_gcp_save.m_master.m_time_between_gcp = tmp;
+    }
+    
+    Uint32 tmp = 0;
     if (ndb_mgm_get_int_parameter(p, CFG_DB_MICRO_GCP_INTERVAL, &tmp) == 0 &&
         tmp)
     {
       /**
-       * A value is set for micro gcp...run new protocol when applicable
+       * Set time-between epochs
        */
       if (tmp > m_gcp_save.m_master.m_time_between_gcp)
         tmp = m_gcp_save.m_master.m_time_between_gcp;
@@ -14862,24 +14916,19 @@ void Dbdih::initCommonData()
       m_micro_gcp.m_master.m_time_between_gcp = tmp;
     }
 
-    /**
-     * No config...hard code...
-     */
-    m_gcp_monitor.m_gcp_save.m_max_lag = 
-      (m_gcp_save.m_master.m_time_between_gcp + 120000) / 100; // 2 minutes
+    { // Set time-between global checkpoint timeout
+      Uint32 tmp = 120000;     // No config, hard code 2 minutes
+      tmp += max_failure_time; //
+      m_gcp_monitor.m_gcp_save.m_max_lag = 
+        (m_gcp_save.m_master.m_time_between_gcp + tmp) / 100;
+    }
 
-    {
+    { // Set time-between epochs timeout
       Uint32 tmp = 4000;
-      Uint32 hbDBDB = 1500;
-      Uint32 arbitTimeout = 1000;
       ndb_mgm_get_int_parameter(p, CFG_DB_MICRO_GCP_TIMEOUT, &tmp);
-      ndb_mgm_get_int_parameter(p, CFG_DB_HEARTBEAT_INTERVAL, &hbDBDB);
-      ndb_mgm_get_int_parameter(p, CFG_DB_ARBIT_TIMEOUT, &arbitTimeout);
-      Uint32 max_lag = tmp + 4 * hbDBDB;
-      if (tmp + arbitTimeout > max_lag)
-        max_lag = tmp + arbitTimeout;
+      tmp += max_failure_time;
       m_gcp_monitor.m_micro_gcp.m_max_lag = 
-        (m_micro_gcp.m_master.m_time_between_gcp + max_lag) / 100;
+        (m_micro_gcp.m_master.m_time_between_gcp + tmp) / 100;
     }
   }
 }//Dbdih::initCommonData()

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-10-13 12:22:51 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-10-20 09:49:55 +0000
@@ -13173,7 +13173,7 @@ void Dblqh::execBACKUP_FRAGMENT_CONF(Sig
   /**
    * Update maxGciInLcp after scan has been performed
    */
-#if defined VM_TRACE || defined ERROR_INSERTED
+#if defined VM_TRACE || defined ERROR_INSERT
   if (fragptr.p->newestGci != fragptr.p->maxGciInLcp)
   {
     ndbout_c("tab: %u frag: %u increasing maxGciInLcp from %u to %u",


--===============6203541655930055621==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 170419e521df51e70372eac2847b6a827cd7055f
# timestamp: 2010-10-20 11:50:19 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
hPWijLg=


--===============6203541655930055621==--