summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorSujatha Sivakumar <sujatha.sivakumar@oracle.com>2016-03-01 12:29:51 +0530
committerSujatha Sivakumar <sujatha.sivakumar@oracle.com>2016-03-01 12:29:51 +0530
commit8361151765cc5efd72ad18c5553f80aa440a1d83 (patch)
tree3491624d184a21c83db6283141c32be797b40c92 /sql/log.h
parentbb32ac1d9b6c1333316a8da32ea46105eceefa29 (diff)
downloadmariadb-git-8361151765cc5efd72ad18c5553f80aa440a1d83.tar.gz
Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS
FULL Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO THREAD WAITS FOR DISK SPACE Problem: ======== Currently SHOW SLAVE STATUS blocks if IO thread waits for disk space. This makes automation tools verifying server health block on taking relevant action. Finally this will create SHOW SLAVE STATUS piles. Analysis: ========= SHOW SLAVE STATUS hangs on mi->data_lock if relay log write is waiting for free disk space while holding mi->data_lock. mi->data_lock is needed to protect the format description event (mi->format_description_event) which is accessed by the clients running FLUSH LOGS and slave IO thread. Note relay log writes don't need to be protected by mi->data_lock, LOCK_log is used to protect relay log between IO and SQL thread (see MYSQL_BIN_LOG::append_event). The code takes mi->data_lock to protect mi->format_description_event during relay log rotate which might get triggered right after relay log write. Fix: ==== Release the data_lock just for the duration of writing into relay log. Made change to ensure the following lock order is maintained to avoid deadlocks. data_lock, LOCK_log data_lock is held during relay log rotations to protect the description event.
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h
index 1fc13afe7d1..7d1c3161ac2 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
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
@@ -20,6 +20,7 @@
#include "handler.h" /* my_xid */
class Relay_log_info;
+class Master_info;
class Format_description_log_event;
@@ -454,8 +455,8 @@ public:
v stands for vector
invoked as appendv(buf1,len1,buf2,len2,...,bufn,lenn,0)
*/
- bool appendv(const char* buf,uint len,...);
- bool append(Log_event* ev);
+ bool appendv(Master_info* mi, const char* buf,uint len,...);
+ bool append(Log_event* ev, Master_info* mi);
void make_log_name(char* buf, const char* log_ident);
bool is_active(const char* log_file_name);