Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
00c87c1b
Commit
00c87c1b
authored
Feb 26, 2001
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Plain Diff
sql/slave.cc
merged
parents
f78adcc2
4b9fdfc3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
15 deletions
+44
-15
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
sql/slave.cc
sql/slave.cc
+39
-11
sql/slave.h
sql/slave.h
+4
-4
No files found.
BitKeeper/etc/logging_ok
View file @
00c87c1b
mwagner@evoq.mwagner.org
mwagner@evoq.mwagner.org
heikki@donna.mysql.fi
heikki@donna.mysql.fi
sasha@mysql.sashanet.com
sql/slave.cc
View file @
00c87c1b
...
@@ -588,7 +588,7 @@ int show_master_info(THD* thd)
...
@@ -588,7 +588,7 @@ int show_master_info(THD* thd)
net_store_data
(
packet
,
(
uint32
)
glob_mi
.
port
);
net_store_data
(
packet
,
(
uint32
)
glob_mi
.
port
);
net_store_data
(
packet
,
(
uint32
)
glob_mi
.
connect_retry
);
net_store_data
(
packet
,
(
uint32
)
glob_mi
.
connect_retry
);
net_store_data
(
packet
,
glob_mi
.
log_file_name
);
net_store_data
(
packet
,
glob_mi
.
log_file_name
);
net_store_data
(
packet
,
(
longlong
)
glob_mi
.
pos
);
net_store_data
(
packet
,
(
uint32
)
glob_mi
.
pos
);
pthread_mutex_unlock
(
&
glob_mi
.
lock
);
pthread_mutex_unlock
(
&
glob_mi
.
lock
);
pthread_mutex_lock
(
&
LOCK_slave
);
pthread_mutex_lock
(
&
LOCK_slave
);
net_store_data
(
packet
,
slave_running
?
"Yes"
:
"No"
);
net_store_data
(
packet
,
slave_running
?
"Yes"
:
"No"
);
...
@@ -1150,7 +1150,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1150,7 +1150,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
int
error
=
1
;
int
error
=
1
;
bool
retried_once
=
0
;
bool
retried_once
=
0
;
u
longlong
last_failed_pos
=
0
;
u
int32
last_failed_pos
=
0
;
// needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff
// needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff
my_thread_init
();
my_thread_init
();
...
@@ -1160,7 +1160,10 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1160,7 +1160,10 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
pthread_detach_this_thread
();
pthread_detach_this_thread
();
if
(
init_slave_thread
(
thd
)
||
init_master_info
(
&
glob_mi
))
if
(
init_slave_thread
(
thd
)
||
init_master_info
(
&
glob_mi
))
goto
err
;
{
sql_print_error
(
"Failed during slave thread initialization"
);
goto
err
;
}
thd
->
thread_stack
=
(
char
*
)
&
thd
;
// remember where our stack is
thd
->
thread_stack
=
(
char
*
)
&
thd
;
// remember where our stack is
thd
->
temporary_tables
=
save_temporary_tables
;
// restore temp tables
thd
->
temporary_tables
=
save_temporary_tables
;
// restore temp tables
threads
.
append
(
thd
);
threads
.
append
(
thd
);
...
@@ -1175,7 +1178,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1175,7 +1178,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
goto
err
;
goto
err
;
}
}
thd
->
proc_info
=
"
C
onnecting to master"
;
thd
->
proc_info
=
"
c
onnecting to master"
;
#ifndef DBUG_OFF
#ifndef DBUG_OFF
sql_print_error
(
"Slave thread initialized"
);
sql_print_error
(
"Slave thread initialized"
);
#endif
#endif
...
@@ -1187,18 +1190,25 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1187,18 +1190,25 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
RPL_LOG_NAME
,
RPL_LOG_NAME
,
glob_mi
.
pos
);
glob_mi
.
pos
);
else
else
goto
err
;
{
sql_print_error
(
"Slave thread killed while connecting to master"
);
goto
err
;
}
while
(
!
slave_killed
(
thd
))
while
(
!
slave_killed
(
thd
))
{
{
thd
->
proc_info
=
"
R
equesting binlog dump"
;
thd
->
proc_info
=
"
r
equesting binlog dump"
;
if
(
request_dump
(
mysql
,
&
glob_mi
))
if
(
request_dump
(
mysql
,
&
glob_mi
))
{
{
sql_print_error
(
"Failed on request_dump()"
);
sql_print_error
(
"Failed on request_dump()"
);
if
(
slave_killed
(
thd
))
if
(
slave_killed
(
thd
))
goto
err
;
goto
err
;
sql_print_error
(
"Slave thread killed while requesting master \
dump"
);
goto
err
;
}
thd
->
proc_info
=
"
W
aiting to reconnect after a failed dump request"
;
thd
->
proc_info
=
"
w
aiting to reconnect after a failed dump request"
;
if
(
mysql
->
net
.
vio
)
if
(
mysql
->
net
.
vio
)
vio_close
(
mysql
->
net
.
vio
);
vio_close
(
mysql
->
net
.
vio
);
// first time retry immediately, assuming that we can recover
// first time retry immediately, assuming that we can recover
...
@@ -1210,14 +1220,21 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1210,14 +1220,21 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
retried_once
=
1
;
retried_once
=
1
;
if
(
slave_killed
(
thd
))
if
(
slave_killed
(
thd
))
{
sql_print_error
(
"Slave thread killed while retrying master \
dump"
);
goto
err
;
goto
err
;
}
thd
->
proc_info
=
"Reconnecting after a failed dump request"
;
thd
->
proc_info
=
"Reconnecting after a failed dump request"
;
sql_print_error
(
"Slave: failed dump request, reconnecting to \
sql_print_error
(
"Slave: failed dump request, reconnecting to \
try again, log '%s' at postion %ld"
,
RPL_LOG_NAME
,
try again, log '%s' at postion %ld"
,
RPL_LOG_NAME
,
last_failed_pos
=
glob_mi
.
pos
);
last_failed_pos
=
glob_mi
.
pos
);
if
(
safe_reconnect
(
thd
,
mysql
,
&
glob_mi
)
||
slave_killed
(
thd
))
if
(
safe_reconnect
(
thd
,
mysql
,
&
glob_mi
)
||
slave_killed
(
thd
))
{
sql_print_error
(
"Slave thread killed during or after reconnect"
);
goto
err
;
goto
err
;
}
continue
;
continue
;
}
}
...
@@ -1228,7 +1245,10 @@ try again, log '%s' at postion %ld", RPL_LOG_NAME,
...
@@ -1228,7 +1245,10 @@ try again, log '%s' at postion %ld", RPL_LOG_NAME,
thd
->
proc_info
=
"Reading master update"
;
thd
->
proc_info
=
"Reading master update"
;
uint
event_len
=
read_event
(
mysql
,
&
glob_mi
);
uint
event_len
=
read_event
(
mysql
,
&
glob_mi
);
if
(
slave_killed
(
thd
))
if
(
slave_killed
(
thd
))
goto
err
;
{
sql_print_error
(
"Slave thread killed while reading event"
);
goto
err
;
}
if
(
event_len
==
packet_error
)
if
(
event_len
==
packet_error
)
{
{
...
@@ -1241,13 +1261,21 @@ try again, log '%s' at postion %ld", RPL_LOG_NAME,
...
@@ -1241,13 +1261,21 @@ try again, log '%s' at postion %ld", RPL_LOG_NAME,
retried_once
=
1
;
retried_once
=
1
;
if
(
slave_killed
(
thd
))
if
(
slave_killed
(
thd
))
goto
err
;
{
thd
->
proc_info
=
"Reconnecting after a failed read"
;
sql_print_error
(
"Slave thread killed while waiting to \
reconnect after a failed read"
);
goto
err
;
}
thd
->
proc_info
=
"reconnecting after a failed read"
;
sql_print_error
(
"Slave: Failed reading log event, \
sql_print_error
(
"Slave: Failed reading log event, \
reconnecting to retry, log '%s' position %ld"
,
RPL_LOG_NAME
,
reconnecting to retry, log '%s' position %ld"
,
RPL_LOG_NAME
,
last_failed_pos
=
glob_mi
.
pos
);
last_failed_pos
=
glob_mi
.
pos
);
if
(
safe_reconnect
(
thd
,
mysql
,
&
glob_mi
)
||
slave_killed
(
thd
))
if
(
safe_reconnect
(
thd
,
mysql
,
&
glob_mi
)
||
slave_killed
(
thd
))
goto
err
;
{
sql_print_error
(
"Slave thread killed during or after a \
reconnect done to recover from failed read"
);
goto
err
;
}
break
;
break
;
}
}
...
...
sql/slave.h
View file @
00c87c1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
typedef
struct
st_master_info
typedef
struct
st_master_info
{
{
char
log_file_name
[
FN_REFLEN
];
char
log_file_name
[
FN_REFLEN
];
u
longlong
pos
,
pending
;
u
int32
pos
,
pending
;
File
fd
;
// we keep the file open, so we need to remember the file pointer
File
fd
;
// we keep the file open, so we need to remember the file pointer
IO_CACHE
file
;
IO_CACHE
file
;
// the variables below are needed because we can change masters on the fly
// the variables below are needed because we can change masters on the fly
...
@@ -29,11 +29,11 @@ typedef struct st_master_info
...
@@ -29,11 +29,11 @@ typedef struct st_master_info
pthread_mutex_destroy
(
&
lock
);
pthread_mutex_destroy
(
&
lock
);
pthread_cond_destroy
(
&
cond
);
pthread_cond_destroy
(
&
cond
);
}
}
inline
void
inc_pending
(
u
longlong
val
)
inline
void
inc_pending
(
u
int32
val
)
{
{
pending
+=
val
;
pending
+=
val
;
}
}
inline
void
inc_pos
(
u
longlong
val
)
inline
void
inc_pos
(
u
int32
val
)
{
{
pthread_mutex_lock
(
&
lock
);
pthread_mutex_lock
(
&
lock
);
pos
+=
val
+
pending
;
pos
+=
val
+
pending
;
...
@@ -43,7 +43,7 @@ typedef struct st_master_info
...
@@ -43,7 +43,7 @@ typedef struct st_master_info
}
}
// thread safe read of position - not needed if we are in the slave thread,
// thread safe read of position - not needed if we are in the slave thread,
// but required otherwise
// but required otherwise
inline
void
read_pos
(
u
longlong
&
var
)
inline
void
read_pos
(
u
int32
&
var
)
{
{
pthread_mutex_lock
(
&
lock
);
pthread_mutex_lock
(
&
lock
);
var
=
pos
;
var
=
pos
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment