diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-27 12:03:02 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-06 16:05:31 +0300 |
| commit | fba683c0697af8fb1c79af4d4e2e739e01e8147d (patch) | |
| tree | abb29a8c6278c3eeda4d6915eda291a6bcf03426 /sql/wsrep_var.cc | |
| parent | 653038ccad1d91f3fff516f6b22462ab83e2b6f8 (diff) | |
| download | mariadb-git-fba683c0697af8fb1c79af4d4e2e739e01e8147d.tar.gz | |
MDEV-17062: Test failure on galera.MW-336
MDEV-17058: Test failure on wsrep.variables
MDEV-17060: Test failure on galera.galera_var_slave_threads
Fix incorrect calculation of increased applier (slave) threads.
Note that increase change takes effect "immediately" but we should
use proper wait condition to wait it. Reducing the number of
slave threads is not immediate as thread will only exit after a
replication event.
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 3826ebed14c..eea1da1d46c 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -564,7 +564,9 @@ void wsrep_node_address_init (const char* value) static void wsrep_slave_count_change_update () { - wsrep_slave_count_change += (wsrep_slave_threads - wsrep_prev_slave_threads); + wsrep_slave_count_change = (wsrep_slave_threads - wsrep_prev_slave_threads); + WSREP_DEBUG("Change on slave threads: New %lu old %lu difference %lu", + wsrep_slave_threads, wsrep_prev_slave_threads, wsrep_slave_count_change); wsrep_prev_slave_threads = wsrep_slave_threads; } |