bk commit into 5.1 tree (tomas:1.2639) BUG#31276

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-28 13:55:13+02:00, tomas@stripped +3 -0
  BUG#31276 Micro GCP timeout set too lo (2 seconds)
  - add config param
  - timeout must be set in relation to other timeouts

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@stripped, 2007-09-28 13:55:10+02:00,
tomas@stripped +1 -0
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-09-28 13:55:10+02:00,
tomas@stripped +14 -2
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-09-28 13:55:10+02:00,
tomas@stripped +13 -1
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

diff -Nrup a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-09-05 15:19:56 +02:00
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-09-28 13:55:10 +02:00
@@ -121,6 +121,7 @@
 
 #define CFG_DB_MAX_ALLOCATE           169
 #define CFG_DB_MICRO_GCP_INTERVAL     170 /* micro gcp */
+#define CFG_DB_MICRO_GCP_TIMEOUT      171
 
 #define CFG_DB_SGA                    198 /* super pool mem */
 #define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */
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-18 15:18:38 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-09-28 13:55:10 +02:00
@@ -12720,8 +12720,20 @@ void Dbdih::initCommonData()
      */
     m_gcp_monitor.m_gcp_save.m_max_lag = 
       (m_gcp_save.m_master.m_time_between_gcp + 120000) / 100; // 2 minutes
-    m_gcp_monitor.m_micro_gcp.m_max_lag = 
-      (m_micro_gcp.m_master.m_time_between_gcp + 2000) / 100;  // 2s
+
+    {
+      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;
+      m_gcp_monitor.m_micro_gcp.m_max_lag = 
+        (m_micro_gcp.m_master.m_time_between_gcp + max_lag) / 100;
+    }
   }
 }//Dbdih::initCommonData()
 
diff -Nrup a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-09-05 15:19:57 +02:00
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-09-28 13:55:10 +02:00
@@ -896,11 +896,23 @@ const ConfigInfo::ParamInfo ConfigInfo::
     CFG_DB_MICRO_GCP_INTERVAL,
     "TimeBetweenEpochs",
     DB_TOKEN,
-    "Time bewteen eopchs (syncronization used e.g for replication)",
+    "Time between epochs (syncronization used e.g for replication)",
     ConfigInfo::CI_USED,
     true,
     ConfigInfo::CI_INT,
     "100",
+    "0",
+    "32000" },
+
+  {
+    CFG_DB_MICRO_GCP_TIMEOUT,
+    "TimeBetweenEpochsTimeout",
+    DB_TOKEN,
+    "Timeout for time between epochs.  Exceeding will cause node shutdown.",
+    ConfigInfo::CI_USED,
+    true,
+    ConfigInfo::CI_INT,
+    "4000",
     "0",
     "32000" },