diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2016-02-29 22:54:58 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-21 16:17:02 -0400 |
| commit | 8ec50ebda3c558e34f263c08b2661929f0bdad2d (patch) | |
| tree | 9207a03c84494934f4d56a920d835627bdcf9913 /sql/lock.cc | |
| parent | b159b666e5191b22618e631e9ed48159be541f7e (diff) | |
| download | mariadb-git-8ec50ebda3c558e34f263c08b2661929f0bdad2d.tar.gz | |
Refs MW-252
- reverted from tracking donor servicing thread. With xtrabackup SST,
xtrabackup thread will call FTWRL and node is desynced upfront
- Skipping desync in FTWRL if node is operating as donor
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 04529308266..8c426deda17 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -1071,7 +1071,7 @@ void Global_read_lock::unlock_global_read_lock(THD *thd) #ifdef WITH_WSREP wsrep_locked_seqno= WSREP_SEQNO_UNDEFINED; wsrep->resume(wsrep); - if (!wsrep_desync && !thd->wsrep_donor) + if (!wsrep_desync && !wsrep_node_is_donor()) { int ret = wsrep->resync(wsrep); if (ret != WSREP_OK) @@ -1141,13 +1141,13 @@ bool Global_read_lock::make_global_read_lock_block_commit(THD *thd) Donor servicing thread is an exception, it should pause provider but not desync, as it is already desynced in donor state */ - if (!WSREP(thd) && !thd->wsrep_donor) + if (!WSREP(thd) && !wsrep_node_is_donor()) { DBUG_RETURN(FALSE); } /* if already desynced or donor, avoid double desyncing */ - if (wsrep_desync || thd->wsrep_donor) + if (wsrep_desync || wsrep_node_is_donor()) { WSREP_DEBUG("desync set upfont, skipping implicit desync for FTWRL: %d", wsrep_desync); |