MDEV-9566 Port Percona Xtrabackup to MariaDB as mariabackup

- Modify backup code to work with MariaDB's 10.1 xtradb - Remove crypt encryption, version_check.pl, "compact backup" - Add encryption plugin
MariaDB · Apr 27, 2017 · ce4c56d · ce4c56d
1 parent d771430
commit ce4c56d
Show file tree

Hide file tree

Showing 38 changed files with 949 additions and 3,163 deletions.
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt
@@ -13,65 +13,138 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-INCLUDE(gcrypt)
-INCLUDE(curl)
-INCLUDE(libev)
 
-ADD_SUBDIRECTORY(libarchive)
-ADD_SUBDIRECTORY(jsmn)
-
-FIND_GCRYPT()
-FIND_CURL()
-FIND_EV()
-
-# xxd is needed to embed version_check script
-FIND_PROGRAM(XXD_PATH xxd)
-
-IF(NOT XXD_PATH)
-  MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.")
-ENDIF(NOT XXD_PATH)
+OPTION(WITH_MARIABACKUP "Include mariabackup" ON)
+IF(NOT WITH_MARIABACKUP)
+  RETURN()
+ENDIF()
+
+
+IF(NOT WIN32)
+  CHECK_SYMBOL_EXISTS(regcomp regex.h HAVE_SYSTEM_REGEX)
+  IF(HAVE_SYSTEM_REGEX)
+    ADD_DEFINITIONS(-DHAVE_SYSTEM_REGEX)
+  ENDIF()
+ENDIF()
+
+IF(WITH_LIBARCHIVE STREQUAL "STATIC")
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+ENDIF()
+
+FIND_PACKAGE(LibArchive)
+
+IF(NOT DEFINED WITH_LIBARCHIVE)  
+  IF(LibArchive_FOUND)
+    SET(WITH_LIBARCHIVE_DEFAULT ON)
+  ELSE()
+    SET(WITH_LIBARCHIVE_DEFAULT OFF)
+  ENDIF()
+  SET(WITH_LIBARCHIVE ${WITH_LIBARCHIVE_DEFAULT} CACHE STRING "Use libarchive for streaming features (ON, OFF or STATIC)" )
+ENDIF()
+
+IF(NOT WITH_LIBARCHIVE MATCHES "^(ON|OFF|STATIC)$")
+  MESSAGE(FATAL_ERROR "Invalid value for WITH_LIBARCHIVE: '${WITH_LIBARCHIVE}'. Use one of ON, OFF or STATIC")
+ENDIF()
+
+IF(UNIX)
+  SET(PIC_FLAG -fPIC)
+ENDIF()
+
+IF((NOT WITH_LIBARCHIVE STREQUAL "OFF") AND (NOT LibArchive_FOUND))
+  IF(CMAKE_VERSION VERSION_LESS "2.8.12")
+    MESSAGE("libarchive can't be built, old cmake")
+  ELSE()
+    # Build a local version
+    INCLUDE(ExternalProject)
+    SET(libarchive_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive)
+    SET(libarchive_CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+      -DENABLE_ICONV=OFF
+      -DENABLE_TAR=ON
+      -DENABLE_OPENSSL=OFF
+      -DENABLE_TEST=OFF
+      "-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} ${PIC_FLAG}"
+      "-DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO} ${PIC_FLAG}"
+      "-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} ${PIC_FLAG}"
+      "-DCMAKE_C_FLAGS_MINSIZEREL=${CMAKE_C_FLAGS_MINSIZEREL} ${PIC_FLAG}"
+    )
+    IF(WIN32)
+      SET(libarchive_CMAKE_ARGS  ${libarchive_CMAKE_ARGS}    -DWINDOWS_VERSION=WIN7 -DCMAKE_DEBUG_POSTFIX=d)
+    ENDIF()
+
+    SET(LIBARCHIVE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/libarchive)
+    ExternalProject_Add(libarchive
+      PREFIX ${libarchive_PREFIX}
+      DOWNLOAD_DIR ${LIBARCHIVE_DIR}
+      URL http://www.libarchive.org/downloads/libarchive-3.2.2.tar.gz
+      INSTALL_DIR ${LIBARCHIVE_DIR}
+      CMAKE_ARGS ${libarchive_CMAKE_ARGS}
+    )
+    ADD_LIBRARY(archive_static STATIC IMPORTED)
+    ADD_DEPENDENCIES(archive_static libarchive)
+    IF(WIN32)
+      SET(LIBARCHIVE_RELEASE_LIB ${LIBARCHIVE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}archive_static${CMAKE_STATIC_LIBRARY_SUFFIX})
+      SET(LIBARCHIVE_DEBUG_LIB ${LIBARCHIVE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}archive_staticd${CMAKE_STATIC_LIBRARY_SUFFIX})
+      SET_PROPERTY(TARGET archive_static PROPERTY IMPORTED_LOCATION_RELWITHDEBINFO ${LIBARCHIVE_RELEASE_LIB})
+      SET_PROPERTY(TARGET archive_static PROPERTY IMPORTED_LOCATION_RELEASE ${LIBARCHIVE_RELEASE_LIB})
+      SET_PROPERTY(TARGET archive_static PROPERTY IMPORTED_LOCATION_DEBUG ${LIBARCHIVE_DEBUG_LIB})
+      SET_PROPERTY(TARGET archive_static PROPERTY IMPORTED_LOCATION_MINSIZEREL ${LIBARCHIVE_RELEASE_LIB})
+    ELSE()
+      SET_PROPERTY(TARGET archive_static PROPERTY IMPORTED_LOCATION ${LIBARCHIVE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}archive${CMAKE_STATIC_LIBRARY_SUFFIX})
+    ENDIF()
+
+    SET(LibArchive_FOUND ON )
+    SET(LibArchive_INCLUDE_DIRS ${LIBARCHIVE_DIR}/include )
+    SET(LibArchive_LIBRARIES archive_static)
+    IF(WIN32)
+      SET(LIBARCHIVE_STATIC 1)
+    ENDIF()
+  ENDIF()
+ENDIF()
+
+
+IF(WITH_LIBARCHIVE AND LibArchive_FOUND)
+  ADD_DEFINITIONS(-DHAVE_LIBARCHIVE)
+  IF(LIBARCHIVE_STATIC)
+    ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
+  ENDIF()
+  INCLUDE_DIRECTORIES(${LibArchive_INCLUDE_DIRS})
+  LINK_LIBRARIES(${LibArchive_LIBRARIES})
+  SET(DS_ARCHIVE_SOURCE ds_archive.c)
+ENDIF()
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
-  ${CMAKE_SOURCE_DIR}/storage/innobase/include
+  ${CMAKE_SOURCE_DIR}/storage/xtradb/include
   ${CMAKE_SOURCE_DIR}/sql
-  ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/libarchive/libarchive
-  ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/quicklz
-  ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/jsmn
-  ${GCRYPT_INCLUDE_DIR}
-  ${CURL_INCLUDE_DIRS}
-  ${LIBEV_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/quicklz
+  ${CMAKE_CURRENT_SOURCE_DIR}
   )
 
-ADD_DEFINITIONS(${SSL_DEFINES})
+IF(NOT HAVE_SYSTEM_REGEX)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/pcre)
+ENDIF()
 
+ADD_DEFINITIONS(-UMYSQL_SERVER)
 ########################################################################
 # xtrabackup binary
 ########################################################################
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h )
 
-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
-                   COMMAND ${XXD_PATH} --include version_check.pl
-                   ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+IF(WIN32)
+  SET(NT_SERVICE_SOURCE ${PROJECT_SOURCE_DIR}/sql/nt_servc.cc)
+ELSE()
+  SET(NT_SERVICE_SOURCE)
+ENDIF()
 
-ADD_CUSTOM_TARGET(GenVersionCheck
-                  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h)
+ADD_DEFINITIONS(-DPCRE_STATIC=1)
 
-SET_SOURCE_FILES_PROPERTIES(
-  xtrabackup.cc
-  backup_mysql.cc
-  PROPERTIES COMPILE_FLAGS -DMYSQL_CLIENT)
-
-MYSQL_ADD_EXECUTABLE(xtrabackup
+MYSQL_ADD_EXECUTABLE(mariabackup
   xtrabackup.cc
   innobackupex.cc
   changed_page_bitmap.cc
-  compact.cc
   datasink.c
-  ds_archive.c
+  ${DS_ARCHIVE_SOURCE}
   ds_buffer.c
   ds_compress.c
   ds_encrypt.c
@@ -89,85 +162,45 @@ MYSQL_ADD_EXECUTABLE(xtrabackup
   xbstream_write.c
   backup_mysql.cc
   backup_copy.cc
-  ../../../../sql-common/client_authentication.cc
+  encryption_plugin.cc
+  ${PROJECT_SOURCE_DIR}/libmysql/libmysql.c
+  ${PROJECT_SOURCE_DIR}/sql/net_serv.cc
+  ${NT_SERVICE_SOURCE}
+  COMPONENT backup
   )
 
-SET_TARGET_PROPERTIES(xtrabackup PROPERTIES ENABLE_EXPORTS TRUE)
 
-TARGET_LINK_LIBRARIES(xtrabackup 
-  mysqlserver 
-  ${GCRYPT_LIBS} 
-  archive_static
-  )
+# Export all symbols on Unix, for better crash callstacks
+SET_TARGET_PROPERTIES(mariabackup PROPERTIES ENABLE_EXPORTS TRUE)
 
-ADD_DEPENDENCIES(xtrabackup GenVersionCheck)
 
-########################################################################
-# innobackupex symlink
-########################################################################
-ADD_CUSTOM_COMMAND(TARGET xtrabackup
-                   COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink
-                           xtrabackup innobackupex)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/innobackupex DESTINATION bin)
+TARGET_LINK_LIBRARIES(mariabackup sql)
+
+IF(NOT HAVE_SYSTEM_REGEX)
+  TARGET_LINK_LIBRARIES(mariabackup pcreposix)
+ENDIF()
+
 
 ########################################################################
 # xbstream binary
 ########################################################################
-MYSQL_ADD_EXECUTABLE(xbstream
+MYSQL_ADD_EXECUTABLE(mbstream
   ds_buffer.c
   ds_local.c
   ds_stdout.c
   datasink.c
   xbstream.c
   xbstream_read.c
   xbstream_write.c
-  )
-
-SET_TARGET_PROPERTIES(xbstream
-        PROPERTIES LINKER_LANGUAGE CXX
-        )
-
-TARGET_LINK_LIBRARIES(xbstream
-  mysys
-  mysys_ssl
-  )
 
-########################################################################
-# xbcrypt binary
-########################################################################
-MYSQL_ADD_EXECUTABLE(xbcrypt
-  xbcrypt.c
-  xbcrypt_common.c
-  xbcrypt_read.c
-  xbcrypt_write.c
+  COMPONENT backup
   )
 
-SET_TARGET_PROPERTIES(xbcrypt
-        PROPERTIES LINKER_LANGUAGE CXX
-        )
 
-TARGET_LINK_LIBRARIES(xbcrypt
-  ${GCRYPT_LIBS}
+TARGET_LINK_LIBRARIES(mbstream
   mysys
-  mysys_ssl
-  )
+)
 
-########################################################################
-# xbcloud binary
-########################################################################
-MYSQL_ADD_EXECUTABLE(xbcloud
-  xbcloud.cc
-  )
-
-SET_TARGET_PROPERTIES(xbcloud
-        PROPERTIES LINKER_LANGUAGE CXX
-        )
-
-TARGET_LINK_LIBRARIES(xbcloud
-  ${GCRYPT_LIBS}
-  ${LIBEV_LIBRARIES}
-  ${CURL_LIBRARIES}
-  mysys
-  mysys_ssl
-  jsmn
-  )
+IF(MSVC)
+  SET_TARGET_PROPERTIES(mbstream PROPERTIES LINK_FLAGS setargv.obj)
+ENDIF()