Merge lp:~akopytov/percona-xtrabackup/bug766305 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Bug #766305: Use MySQL Code to get stack trace

    Implemented the following to reuse MySQL stacktrace dump code:

    - set up handle_fatal_signal() as a signal handler for certain signals
    in xtrabackup.cc::main().

    - handle_fatal_signal() has been modified to avoid
    dumping some server-specific information.

    - the hidden visibility attribute in UNIV_INTERN symbols does not make
    any sense for XtraBackup, but prevents fully resolved stacktraces on
    Linux, so it has been removed.

    - backtrace_symbols() requires passing -export-dynamic to the linker on
    Linux, so the corresponding property has been added for the xtrabackup
    CMake target.

    - fixed cxxabi.h detection in configure.cmake to make symbol demangling
    possible.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/212/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'configure.cmake'
--- configure.cmake	2014-09-15 08:52:36 +0000
+++ configure.cmake	2014-09-20 19:02:31 +0000
@@ -264,6 +264,7 @@
 # Tests for header files
 #
 INCLUDE (CheckIncludeFiles)
+INCLUDE (CheckIncludeFileCXX)
 
 CHECK_INCLUDE_FILES ("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
@@ -271,7 +272,7 @@
 CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
-CHECK_INCLUDE_FILES (cxxabi.h HAVE_CXXABI_H)
+CHECK_INCLUDE_FILE_CXX (cxxabi.h HAVE_CXXABI_H)
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 
=== modified file 'sql/signal_handler.cc'
--- sql/signal_handler.cc	2014-09-15 08:52:36 +0000
+++ sql/signal_handler.cc	2014-09-20 19:02:31 +0000
@@ -86,65 +86,18 @@
   my_safe_itoa(10, mins, &mins_buf[2]);
   my_safe_itoa(10, secs, &secs_buf[2]);
 
-  my_safe_printf_stderr("%s:%s:%s UTC - mysqld got " SIGNAL_FMT " ;\n",
+  my_safe_printf_stderr("%s:%s:%s UTC - xtrabackup got " SIGNAL_FMT " ;\n",
                         hrs_buf, mins_buf, secs_buf, sig);
 
   my_safe_printf_stderr("%s",
-    "This could be because you hit a bug. It is also possible that this binary\n"
-    "or one of the libraries it was linked against is corrupt, improperly built,\n"
-    "or misconfigured. This error can also be caused by malfunctioning hardware.\n");
+    "This could be because you hit a bug or data is corrupted.\n"
+    "This error can also be caused by malfunctioning hardware.\n");
 
   my_safe_printf_stderr("%s",
     "We will try our best to scrape up some info that will hopefully help\n"
     "diagnose the problem, but since we have already crashed, \n"
     "something is definitely wrong and this may fail.\n\n");
 
-  my_safe_printf_stderr("key_buffer_size=%lu\n",
-                        (ulong) dflt_key_cache->key_cache_mem_size);
-
-  my_safe_printf_stderr("read_buffer_size=%ld\n",
-                        (long) global_system_variables.read_buff_size);
-
-  my_safe_printf_stderr("max_used_connections=%lu\n",
-                        (ulong) max_used_connections);
-
-  my_safe_printf_stderr("max_threads=%u\n",
-                        (uint) thread_scheduler->max_threads);
-
-  my_safe_printf_stderr("thread_count=%u\n", get_thread_count());
-
-  my_safe_printf_stderr("connection_count=%u\n", (uint) connection_count);
-
-  my_safe_printf_stderr("It is possible that mysqld could use up to \n"
-                        "key_buffer_size + "
-                        "(read_buffer_size + sort_buffer_size)*max_threads = "
-                        "%lu K  bytes of memory\n",
-                        ((ulong) dflt_key_cache->key_cache_mem_size +
-                         (global_system_variables.read_buff_size +
-                          global_system_variables.sortbuff_size) *
-                         thread_scheduler->max_threads +
-                         max_connections * sizeof(THD)) / 1024);
-
-  my_safe_printf_stderr("%s",
-    "Hope that's ok; if not, decrease some variables in the equation.\n\n");
-
-#if defined(HAVE_LINUXTHREADS)
-#define UNSAFE_DEFAULT_LINUX_THREADS 200
-  if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
-  {
-    my_safe_printf_stderr(
-      "You seem to be running 32-bit Linux and have "
-      "%d concurrent connections.\n"
-      "If you have not changed STACK_SIZE in LinuxThreads "
-      "and built the binary \n"
-      "yourself, LinuxThreads is quite likely to steal "
-      "a part of the global heap for\n"
-      "the thread stack. Please read "
-      "http://dev.mysql.com/doc/mysql/en/linux-installation.html\n\n"
-      thread_count);
-  }
-#endif /* HAVE_LINUXTHREADS */
-
 #ifdef HAVE_STACKTRACE
   THD *thd=current_thd;
 
@@ -159,40 +112,8 @@
     my_print_stacktrace(thd ? (uchar*) thd->thread_stack : NULL,
                         my_thread_stack_size);
   }
-  if (thd)
-  {
-    const char *kreason= "UNKNOWN";
-    switch (thd->killed) {
-    case THD::NOT_KILLED:
-      kreason= "NOT_KILLED";
-      break;
-    case THD::KILL_BAD_DATA:
-      kreason= "KILL_BAD_DATA";
-      break;
-    case THD::KILL_CONNECTION:
-      kreason= "KILL_CONNECTION";
-      break;
-    case THD::KILL_QUERY:
-      kreason= "KILL_QUERY";
-      break;
-    case THD::KILLED_NO_VALUE:
-      kreason= "KILLED_NO_VALUE";
-      break;
-    }
-    my_safe_printf_stderr("%s", "\n"
-      "Trying to get some variables.\n"
-      "Some pointers may be invalid and cause the dump to abort.\n");
-
-    my_safe_printf_stderr("Query (%p): ", thd->query());
-    my_safe_print_str(thd->query(), MY_MIN(1024U, thd->query_length()));
-    my_safe_printf_stderr("Connection ID (thread ID): %lu\n",
-                          (ulong) thd->thread_id);
-    my_safe_printf_stderr("Status: %s\n\n", kreason);
-  }
-  my_safe_printf_stderr("%s",
-    "The manual page at "
-    "http://dev.mysql.com/doc/mysql/en/crashing.html contains\n"
-    "information that should help you find out what is causing the crash.\n");
+  my_safe_printf_stderr("%s", "\n"
+    "Please report a bug at https://bugs.launchpad.net/percona-xtrabackup\n");
 
 #endif /* HAVE_STACKTRACE */
 
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-09-15 08:52:36 +0000
+++ storage/innobase/include/univ.i	2014-09-20 19:02:31 +0000
@@ -247,15 +247,9 @@
 			at a buffer page write: it should be tested with this
 			option off; also some ibuf tests are suppressed */
 
-/* Linkage specifier for non-static InnoDB symbols (variables and functions)
-that are only referenced from within InnoDB, not from MySQL. We disable the
-GCC visibility directive on all Sun operating systems because there is no
-easy way to get it to work. See http://bugs.mysql.com/bug.php?id=52263. */
-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(sun) || defined(__INTEL_COMPILER)
-# define UNIV_INTERN __attribute__((visibility ("hidden")))
-#else
-# define UNIV_INTERN
-#endif
+/* For XtraBackup, we disable the GCC visibility directive for InnoDB internal
+symbols as that allows XtraBackup print fully resolved stacktraces on Linux. */
+#define UNIV_INTERN
 #if defined(INNODB_COMPILER_HINTS)      \
     && defined __GNUC__                 \
     && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
=== modified file 'storage/innobase/xtrabackup/src/CMakeLists.txt'
--- storage/innobase/xtrabackup/src/CMakeLists.txt	2014-09-04 16:53:33 +0000
+++ storage/innobase/xtrabackup/src/CMakeLists.txt	2014-09-20 19:02:31 +0000
@@ -58,6 +58,8 @@
   xbstream_write.c
   )
 
+SET_TARGET_PROPERTIES(xtrabackup PROPERTIES ENABLE_EXPORTS TRUE)
+
 TARGET_LINK_LIBRARIES(xtrabackup 
   mysqlserver 
   ${GCRYPT_LIBS} 
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-12 10:09:33 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-20 19:02:31 +0000
@@ -309,6 +309,8 @@
 ds_ctxt_t       *ds_data     = NULL;
 ds_ctxt_t       *ds_meta     = NULL;
 
+extern "C" sig_handler handle_fatal_signal(int sig);
+
 /* Simple datasink creation tracking...add datasinks in the reverse order you
 want them destroyed. */
 #define XTRABACKUP_MAX_DATASINKS	10
@@ -5979,8 +5981,23 @@
 
 int main(int argc, char **argv)
 {
+	struct sigaction sa;
 	int ho_error;
 
+	/* Print a stacktrace on some signals */
+	sa.sa_flags = SA_RESETHAND | SA_NODEFER;
+	sigemptyset(&sa.sa_mask);
+	sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
+#ifdef HAVE_STACKTRACE
+	my_init_stacktrace();
+#endif
+	sa.sa_handler = handle_fatal_signal;
+	sigaction(SIGSEGV, &sa, NULL);
+	sigaction(SIGABRT, &sa, NULL);
+	sigaction(SIGBUS, &sa, NULL);
+	sigaction(SIGILL, &sa, NULL);
+	sigaction(SIGFPE, &sa, NULL);
+
 #ifdef __linux__
 	/* Ensure xtrabackup process is killed when the parent one
 	(innobackupex) is terminated with an unhandled signal */
 
=== added file 'storage/innobase/xtrabackup/test/t/bug766305.sh'
--- storage/innobase/xtrabackup/test/t/bug766305.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug766305.sh	2014-09-20 19:02:31 +0000
@@ -0,0 +1,36 @@
+########################################################################
+# Bug #766305: Use MySQL Code to get stack trace
+########################################################################
+
+start_server --innodb_file_per_table
+
+if [ ${ASAN_OPTIONS:-undefined} = "undefined" ]
+then
+    skip_test "Incompatible with AddressSanitizer"
+fi
+
+mkdir $topdir/backup
+
+xtrabackup --backup --target-dir=$topdir/backup --debug-sync="data_copy_thread_func" &
+
+job_pid=$!
+pid_file=$topdir/backup/xtrabackup_debug_sync
+
+# Wait for xtrabackup to suspend
+i=0
+while [ ! -r "$pid_file" ]
+do
+    sleep 1
+    i=$((i+1))
+    echo "Waited $i seconds for $pid_file to be created"
+done
+
+xb_pid=`cat $pid_file`
+
+kill -SIGSEGV $xb_pid
+kill -SIGCONT $xb_pid
+
+run_cmd_expect_failure wait $job_pid
+
+grep -q "handle_fatal_signal" $OUTFILE || \
+  die "Could not find a resolved stacktrace in the log"