1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7129 : Galera duplicate error on autoincrement field primary key

Browse Source 
Merged fix for https://github.com/codership/mysql-wsrep/issues/18.
This commit is contained in:
Nirbhay Choubey 2015-01-07 13:12:31 -05:00
parent 455f77bdbb
commit 54b26b494b
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/wsrep_hton.cc
View File

@ -490,7 +490,8 @@ wsrep_run_wsrep_commit(THD *thd, handlerton *hton, bool all)
case WSREP_BF_ABORT:
DBUG_ASSERT(thd->wsrep_trx_meta.gtid.seqno != WSREP_SEQNO_UNDEFINED);
case WSREP_TRX_FAIL:
WSREP_DEBUG("commit failed for reason: %d", rcode);
WSREP_DEBUG("commit failed for reason: %d %lu %s", rcode, thd->thread_id,
thd->query());
DBUG_PRINT("wsrep", ("replicating commit fail"));
thd->wsrep_query_state= QUERY_EXEC;

28
storage/innobase/handler/ha_innodb.cc
View File

@ -7623,6 +7623,14 @@ no_commit:
#ifdef WITH_WSREP
/* workaround for LP bug #355000, retrying the insert */
case SQLCOM_INSERT:
WSREP_DEBUG("DUPKEY error for autoinc\n"
"THD %ld, value %llu, off %llu inc %llu",
wsrep_thd_thread_id(current_thd),
auto_inc,
prebuilt->autoinc_offset,
prebuilt->autoinc_increment);
if (wsrep_on(current_thd) &&
auto_inc_inserted &&
wsrep_drupal_282555_workaround &&
@ -7638,8 +7646,7 @@ no_commit:
error= DB_SUCCESS;
wsrep_thd_set_conflict_state(
current_thd, MUST_ABORT);
innobase_srv_conc_exit_innodb(
prebuilt->trx);
innobase_srv_conc_exit_innodb(prebuilt->trx);
/* jump straight to func exit over
* later wsrep hooks */
goto func_exit;
@ -9700,10 +9707,10 @@ wsrep_append_key(
DBUG_ENTER("wsrep_append_key");
bool const copy = true;
#ifdef WSREP_DEBUG_PRINT
fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s ",
fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s\n Query: %s ",
(shared) ? "Shared" : "Exclusive",
wsrep_thd_thread_id(thd), (long long)trx->id, key_len,
table_share->table_name.str);
table_share->table_name.str, wsrep_thd_query(thd));
for (int i=0; i<key_len; i++) {
fprintf(stderr, "%hhX, ", key[i]);
}
@ -14746,7 +14753,20 @@ ha_innobase::get_auto_increment(
next value in the series. */
if (prebuilt->autoinc_increment > increment) {
#ifdef WITH_WSREP
WSREP_DEBUG("autoinc decrease: %llu -> %llu\n"
"THD: %ld, current: %llu, autoinc: %llu",
prebuilt->autoinc_increment,
increment,
wsrep_thd_thread_id(ha_thd()),
current, autoinc);
if (!wsrep_on(ha_thd()))
{
#endif /* WITH_WSREP */
current = autoinc - prebuilt->autoinc_increment;
#ifdef WITH_WSREP
}
#endif /* WITH_WSREP */
current = innobase_next_autoinc(
current, 1, increment, 1, col_max_value);

25
storage/xtradb/handler/ha_innodb.cc
View File

@ -8207,6 +8207,14 @@ no_commit:
#ifdef WITH_WSREP
/* workaround for LP bug #355000, retrying the insert */
case SQLCOM_INSERT:
WSREP_DEBUG("DUPKEY error for autoinc\n"
"THD %ld, value %llu, off %llu inc %llu",
wsrep_thd_thread_id(current_thd),
auto_inc,
prebuilt->autoinc_offset,
prebuilt->autoinc_increment);
if (wsrep_on(current_thd) &&
auto_inc_inserted &&
wsrep_drupal_282555_workaround &&
@ -10331,10 +10339,10 @@ wsrep_append_key(
DBUG_ENTER("wsrep_append_key");
bool const copy = true;
#ifdef WSREP_DEBUG_PRINT
fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s ",
fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s\n Query: %s ",
(shared) ? "Shared" : "Exclusive",
wsrep_thd_thread_id(thd), (long long)trx->id, key_len,
table_share->table_name.str);
table_share->table_name.str, wsrep_thd_query(thd));
for (int i=0; i<key_len; i++) {
fprintf(stderr, "%hhX, ", key[i]);
}
@ -15445,7 +15453,20 @@ ha_innobase::get_auto_increment(
next value in the series. */
if (prebuilt->autoinc_increment > increment) {
#ifdef WITH_WSREP
WSREP_DEBUG("autoinc decrease: %llu -> %llu\n"
"THD: %ld, current: %llu, autoinc: %llu",
prebuilt->autoinc_increment,
increment,
wsrep_thd_thread_id(ha_thd()),
current, autoinc);
if (!wsrep_on(ha_thd()))
{
#endif /* WITH_WSREP */
current = autoinc - prebuilt->autoinc_increment;
#ifdef WITH_WSREP
}
#endif /* WITH_WSREP */
current = innobase_next_autoinc(
current, 1, increment, 1, col_max_value);