diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2015-10-15 15:38:45 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-02 23:37:03 -0500 |
| commit | a2c3549404cbdc55aaaa8537739853d7369aa79a (patch) | |
| tree | ebfe09c518850bed19795bcc79636310947e62b1 /support-files/CMakeLists.txt | |
| parent | 7877438f3152bb2bdc17ed6cdea94838fdd47be0 (diff) | |
| download | mariadb-git-a2c3549404cbdc55aaaa8537739853d7369aa79a.tar.gz | |
MDEV-427: systemd - use galera_new_cluster instead of bootstrap
Use galera_new_cluster instead. systemctl start mariadb@bootstrap
will generate error message, use_galera_new_cluster.conf is the name
of the file that will generate this error.
Output:
Job for mariadb@bootstrap.service failed. See "systemctl status
mariadb@bootstrap.service" and "journalctl -xe" for details.
● mariadb@bootstrap.service - MariaDB database server
Loaded: loaded (/usr/lib/systemd/system/mariadb@.service; disabled;
vendor preset: disabled)
Drop-In: /usr/lib/systemd/system/mariadb@bootstrap.service.d
└─use_galera_new_cluster.conf
Active: failed (Result: exit-code) since Thu 2015-10-15 19:27:52
CEST; 5s ago
Process: 24334 ExecStart=/usr/bin/false (code=exited,
status=1/FAILURE)
Process: 24330 ExecStart=/usr/bin/echo Please use galera_new_cluster
to start the mariadb service with --wsrep-new-cluster (code=exited,
status=0/SUCCESS)
Main PID: 24334 (code=exited, status=1/FAILURE)
Oct 15 19:27:52 spaceman systemd[1]: Starting MariaDB database server...
Oct 15 19:27:52 spaceman systemd[1]: mariadb@bootstrap.service: main
process exited, code=exited, status=1/FAILURE
Oct 15 19:27:52 spaceman systemd[1]: Failed to start MariaDB database
server.
Oct 15 19:27:52 spaceman systemd[1]: Unit mariadb@bootstrap.service
entered failed state.
Oct 15 19:27:52 spaceman systemd[1]: mariadb@bootstrap.service failed.
Diffstat (limited to 'support-files/CMakeLists.txt')
| -rw-r--r-- | support-files/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index c357528954f..eff2be375b4 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -79,10 +79,10 @@ IF(UNIX) IF(HAVE_SYSTEMD) CONFIGURE_FILE(mariadb.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY) - IF(NOT RPM) + IF(CMAKE_VERSION VERSION_LESS 3.3.0) CONFIGURE_FILE(mariadb@.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) - INSTALL(FILES wsrep-new-cluster.conf + INSTALL(FILES use_galera_new_cluster.conf ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service DESTINATION ${inst_location}/systemd COMPONENT SupportFiles) @@ -90,8 +90,8 @@ IF(UNIX) IF(INSTALL_SYSTEMD_UNITDIR) # @ in directory name broken between CMake version 2.8.12.2 and 3.3 # http://public.kitware.com/Bug/view.php?id=14782 - IF(NOT RPM) - INSTALL(FILES wsrep-new-cluster.conf + IF(NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM) + INSTALL(FILES use_galera_new_cluster.conf DESTINATION "${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d" COMPONENT Server) |