Merge lp:~akopytov/percona-xtrabackup/bug722638-1.6 into lp:percona-xtrabackup/1.6

Proposed by Alexey Kopytov
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 290
Proposed branch: lp:~akopytov/percona-xtrabackup/bug722638-1.6
Merge into: lp:percona-xtrabackup/1.6
Diff against target: 49 lines (+22/-0)
1 file modified
xtrabackup.c (+22/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug722638-1.6
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+76431@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'xtrabackup.c'
--- xtrabackup.c 2011-09-21 09:00:00 +0000
+++ xtrabackup.c 2011-09-21 21:06:26 +0000
@@ -1156,6 +1156,17 @@
1156 { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}1156 { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
1157};1157};
11581158
1159#ifndef __WIN__
1160static int debug_sync_resumed;
1161
1162static void sigcont_handler(int sig);
1163
1164static void sigcont_handler(int sig __attribute__((unused)))
1165{
1166 debug_sync_resumed= 1;
1167}
1168#endif
1169
1159UNIV_INLINE1170UNIV_INLINE
1160void1171void
1161debug_sync_point(const char *name)1172debug_sync_point(const char *name)
@@ -1190,9 +1201,14 @@
1190 "Suspending at debug sync point '%s'. "1201 "Suspending at debug sync point '%s'. "
1191 "Resume with 'kill -SIGCONT %u'.\n", name, (uint) pid);1202 "Resume with 'kill -SIGCONT %u'.\n", name, (uint) pid);
11921203
1204 debug_sync_resumed= 0;
1193 kill(pid, SIGSTOP);1205 kill(pid, SIGSTOP);
1206 while (!debug_sync_resumed) {
1207 sleep(1);
1208 }
11941209
1195 /* On resume */1210 /* On resume */
1211 fprintf(stderr, "xtrabackup: DEBUG: removing the pid file.\n");
1196 my_delete(pid_path, MYF(MY_WME));1212 my_delete(pid_path, MYF(MY_WME));
1197#endif1213#endif
1198}1214}
@@ -6215,6 +6231,12 @@
6215 }6231 }
6216 }6232 }
62176233
6234#ifndef __WIN__
6235 if (xtrabackup_debug_sync) {
6236 signal(SIGCONT, sigcont_handler);
6237 }
6238#endif
6239
6218 /* --backup */6240 /* --backup */
6219 if (xtrabackup_backup)6241 if (xtrabackup_backup)
6220 xtrabackup_backup_func();6242 xtrabackup_backup_func();

Subscribers

People subscribed via source and target branches