summaryrefslogtreecommitdiff
path: root/sql/wsrep_sst.cc
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2020-08-17 08:57:13 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2020-08-25 12:12:44 +0300
commit0be70a1b773ce66ef1803fcce19522fd9c60c07d (patch)
tree20beb43e081986db41c00b30bef6ed531748742e /sql/wsrep_sst.cc
parent6fa40b85be8cd35d337a4b4b7cf910a81518d298 (diff)
downloadmariadb-git-0be70a1b773ce66ef1803fcce19522fd9c60c07d.tar.gz
MDEV-23483: Set Galera SST thd as system thread
Revert change to MDL and set SST donor thread as a system thread. Joiner thread was already a system thread.
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r--sql/wsrep_sst.cc18
1 files changed, 5 insertions, 13 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc
index a6accd52910..af3a80cb67c 100644
--- a/sql/wsrep_sst.cc
+++ b/sql/wsrep_sst.cc
@@ -1,4 +1,4 @@
-/* Copyright 2008-2015 Codership Oy <http://www.codership.com>
+/* Copyright 2008-2020 Codership Oy <http://www.codership.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -192,7 +192,6 @@ bool wsrep_before_SE()
static bool sst_complete = false;
static bool sst_needed = false;
-static bool sst_in_progress = false;
#define WSREP_EXTEND_TIMEOUT_INTERVAL 30
#define WSREP_TIMEDWAIT_SECONDS 10
@@ -1545,11 +1544,11 @@ static void* sst_donor_thread (void* a)
wsrep_uuid_t ret_uuid= WSREP_UUID_UNDEFINED;
// seqno of complete SST
wsrep_seqno_t ret_seqno= WSREP_SEQNO_UNDEFINED;
- // SST is now in progress
- sst_in_progress= true;
- wsp::thd thd(FALSE); // we turn off wsrep_on for this THD so that it can
- // operate with wsrep_ready == OFF
+ // We turn off wsrep_on for this THD so that it can
+ // operate with wsrep_ready == OFF
+ // We also set this SST thread THD as system thread
+ wsp::thd thd(FALSE, true);
wsp::process proc(arg->cmd, "r", arg->env);
err= proc.error();
@@ -1648,8 +1647,6 @@ wait_signal:
wsrep->sst_sent (wsrep, &state_id, -err);
proc.wait();
- sst_in_progress= false;
-
return NULL;
}
@@ -1824,8 +1821,3 @@ void wsrep_SE_initialized()
{
SE_initialized = true;
}
-
-bool wsrep_is_sst_progress()
-{
- return (sst_in_progress);
-}