Commit 8eb42d72 authored by unknown's avatar unknown

ndb: added some retry sleep to not get busy loops

parent 75a52bfb
...@@ -1024,6 +1024,7 @@ ndbcluster_update_slock(THD *thd, ...@@ -1024,6 +1024,7 @@ ndbcluster_update_slock(THD *thd,
const NDBTAB *ndbtab= ndbtab_g.get_table(); const NDBTAB *ndbtab= ndbtab_g.get_table();
NdbTransaction *trans= 0; NdbTransaction *trans= 0;
int retries= 100; int retries= 100;
int retry_sleep= 10; /* 10 milliseconds, transaction */
const NDBCOL *col[SCHEMA_SIZE]; const NDBCOL *col[SCHEMA_SIZE];
unsigned sz[SCHEMA_SIZE]; unsigned sz[SCHEMA_SIZE];
...@@ -1125,6 +1126,7 @@ ndbcluster_update_slock(THD *thd, ...@@ -1125,6 +1126,7 @@ ndbcluster_update_slock(THD *thd,
{ {
if (trans) if (trans)
ndb->closeTransaction(trans); ndb->closeTransaction(trans);
my_sleep(retry_sleep);
continue; // retry continue; // retry
} }
} }
...@@ -1323,6 +1325,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share, ...@@ -1323,6 +1325,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
const NDBTAB *ndbtab= ndbtab_g.get_table(); const NDBTAB *ndbtab= ndbtab_g.get_table();
NdbTransaction *trans= 0; NdbTransaction *trans= 0;
int retries= 100; int retries= 100;
int retry_sleep= 10; /* 10 milliseconds, transaction */
const NDBCOL *col[SCHEMA_SIZE]; const NDBCOL *col[SCHEMA_SIZE];
unsigned sz[SCHEMA_SIZE]; unsigned sz[SCHEMA_SIZE];
...@@ -1427,6 +1430,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share, ...@@ -1427,6 +1430,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
{ {
if (trans) if (trans)
ndb->closeTransaction(trans); ndb->closeTransaction(trans);
my_sleep(retry_sleep);
continue; // retry continue; // retry
} }
} }
...@@ -2715,6 +2719,11 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab, ...@@ -2715,6 +2719,11 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
TABLE *table= share->table; TABLE *table= share->table;
int retries= 100; int retries= 100;
/*
100 milliseconds, temporary error on schema operation can
take some time to be resolved
*/
int retry_sleep= 100;
while (1) while (1)
{ {
pthread_mutex_lock(&injector_mutex); pthread_mutex_lock(&injector_mutex);
...@@ -2843,7 +2852,10 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab, ...@@ -2843,7 +2852,10 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
ndb->dropEventOperation(op); ndb->dropEventOperation(op);
pthread_mutex_unlock(&injector_mutex); pthread_mutex_unlock(&injector_mutex);
if (retries) if (retries)
{
my_sleep(retry_sleep);
continue; continue;
}
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
pthread_mutex_unlock(&injector_mutex); pthread_mutex_unlock(&injector_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment