ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)

+ increase timeout for sync... which now should never occur

3 files changed, 41 insertions, 12 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index f46a5eccabf..8b3ff56a847 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4649,7 +4649,7 @@ int ha_ndbcluster::create(const char *name,
                                share->db, share->table_name,
                                m_table->getObjectId(),
                                m_table->getObjectVersion(),
-                               SOT_CREATE_TABLE);
+                               SOT_CREATE_TABLE, 0, 0, 1);
       break;
     }
   }
@@ -5031,7 +5031,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
                                old_dbname, m_tabname,
                                ndb_table_id, ndb_table_version,
                                SOT_RENAME_TABLE,
-                               m_dbname, new_tabname);
+                               m_dbname, new_tabname, 1);
   }
   if (share)
     free_share(&share);
@@ -5155,7 +5155,7 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb,
                              current_thd->query, current_thd->query_length,
                              share->db, share->table_name,
                              ndb_table_id, ndb_table_version,
-                             SOT_DROP_TABLE);
+                             SOT_DROP_TABLE, 0, 0, 1);
   }
   else if (table_dropped && share && share->op) /* ndbcluster_log_schema_op
                                                    will do a force GCP */
@@ -5752,7 +5752,7 @@ static void ndbcluster_drop_database(char *path)
   ha_ndbcluster::set_dbname(path, db);
   ndbcluster_log_schema_op(current_thd, 0,
                            current_thd->query, current_thd->query_length,
-                           db, "", 0, 0, SOT_DROP_DB);
+                           db, "", 0, 0, SOT_DROP_DB, 0, 0, 0);
 #endif
   DBUG_VOID_RETURN;
 }
@@ -9941,13 +9941,13 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info)
                              thd->query, thd->query_length,
                              "", info->tablespace_name,
                              0, 0,
-                             SOT_TABLESPACE);
+                             SOT_TABLESPACE, 0, 0, 0);
   else
     ndbcluster_log_schema_op(thd, 0,
                              thd->query, thd->query_length,
                              "", info->logfile_group_name,
                              0, 0,
-                             SOT_LOGFILE_GROUP);
+                             SOT_LOGFILE_GROUP, 0, 0, 0);
 #endif
   DBUG_RETURN(FALSE);
 
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 144c073d565..452be961235 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -40,6 +40,12 @@
 #define NDB_SCHEMA_TABLE_FILE "./" NDB_REP_DB "/" NDB_SCHEMA_TABLE
 
 /*
+  Timeout for syncing schema events between
+  mysql servers, and between mysql server and the binlog
+*/
+const int opt_ndb_sync_timeout= 120;
+
+/*
   Flag showing if the ndb injector thread is running, if so == 1
   -1 if it was started but later stopped for some reason
    0 if never started
@@ -498,6 +504,7 @@ ndbcluster_binlog_log_query(THD *thd, enum_binlog_command binlog_command,
   {
   case LOGCOM_CREATE_TABLE:
     type= SOT_CREATE_TABLE;
+    DBUG_ASSERT(FALSE);
     break;
   case LOGCOM_ALTER_TABLE:
     type= SOT_ALTER_TABLE;
@@ -505,9 +512,11 @@ ndbcluster_binlog_log_query(THD *thd, enum_binlog_command binlog_command,
     break;
   case LOGCOM_RENAME_TABLE:
     type= SOT_RENAME_TABLE;
+    DBUG_ASSERT(FALSE);
     break;
   case LOGCOM_DROP_TABLE:
     type= SOT_DROP_TABLE;
+    DBUG_ASSERT(FALSE);
     break;
   case LOGCOM_CREATE_DB:
     type= SOT_CREATE_DB;
@@ -519,12 +528,14 @@ ndbcluster_binlog_log_query(THD *thd, enum_binlog_command binlog_command,
     break;
   case LOGCOM_DROP_DB:
     type= SOT_DROP_DB;
+    DBUG_ASSERT(FALSE);
     break;
   }
   if (log)
   {
     ndbcluster_log_schema_op(thd, 0, query, query_length,
-                             db, table_name, 0, 0, type);
+                             db, table_name, 0, 0, type,
+                             0, 0, 0);
   }
   DBUG_VOID_RETURN;
 }
@@ -995,7 +1006,8 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
                              uint32 ndb_table_id,
                              uint32 ndb_table_version,
                              enum SCHEMA_OP_TYPE type,
-                             const char *new_db, const char *new_table_name)
+                             const char *new_db, const char *new_table_name,
+                             int have_lock_open)
 {
   DBUG_ENTER("ndbcluster_log_schema_op");
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
@@ -1254,8 +1266,13 @@ end:
   if (ndb_error == 0 &&
       !bitmap_is_clear_all(&schema_subscribers))
   {
-    int max_timeout= 10;
+    int max_timeout= opt_ndb_sync_timeout;
     (void) pthread_mutex_lock(&ndb_schema_object->mutex);
+    if (have_lock_open)
+    {
+      safe_mutex_assert_owner(&LOCK_open);
+      (void) pthread_mutex_unlock(&LOCK_open);
+    }
     while (1)
     {
       struct timespec abstime;
@@ -1300,6 +1317,10 @@ end:
                              "distributing", ndb_schema_object->key);
       }
     }
+    if (have_lock_open)
+    {
+      (void) pthread_mutex_lock(&LOCK_open);
+    }
     (void) pthread_mutex_unlock(&ndb_schema_object->mutex);
   }
 
@@ -2698,6 +2719,7 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
                              NDB_SHARE *share, const char *type_str)
 {
   DBUG_ENTER("ndbcluster_handle_drop_table");
+  THD *thd= current_thd;
 
   NDBDICT *dict= ndb->getDictionary();
   if (event_name && dict->dropEvent(event_name))
@@ -2743,10 +2765,14 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
   these out of order, thus we are keeping the SYNC_DROP_ defined
   for now.
 */
+  const char *save_proc_info= thd->proc_info;
 #define SYNC_DROP_
 #ifdef SYNC_DROP_
+  thd->proc_info= "Syncing ndb table schema operation and binlog";
   (void) pthread_mutex_lock(&share->mutex);
-  int max_timeout= 10;
+  safe_mutex_assert_owner(&LOCK_open);
+  (void) pthread_mutex_unlock(&LOCK_open);
+  int max_timeout= opt_ndb_sync_timeout;
   while (share->op)
   {
     struct timespec abstime;
@@ -2770,6 +2796,7 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
                            type_str, share->key);
     }
   }
+  (void) pthread_mutex_lock(&LOCK_open);
   (void) pthread_mutex_unlock(&share->mutex);
 #else
   (void) pthread_mutex_lock(&share->mutex);
@@ -2777,6 +2804,7 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
   share->op= 0;
   (void) pthread_mutex_unlock(&share->mutex);
 #endif
+  thd->proc_info= save_proc_info;
 
   DBUG_RETURN(0);
 }
diff --git a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h
index d82cdccb1b9..7c45dee59d0 100644
--- a/sql/ha_ndbcluster_binlog.h
+++ b/sql/ha_ndbcluster_binlog.h
@@ -138,8 +138,9 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
                              uint32 ndb_table_id,
                              uint32 ndb_table_version,
                              enum SCHEMA_OP_TYPE type,
-                             const char *new_db= 0,
-                             const char *new_table_name= 0);
+                             const char *new_db,
+                             const char *new_table_name,
+                             int have_lock_open);
 int ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
                                  NDB_SHARE *share,
                                  const char *type_str);