Merge lp:~stewart/drizzle/bbug565053-daemon into lp:drizzle/7.0

[Stewart Smith]

adds --daemon option.

heavily based on the memcached daemon code, probably will copy it back there too as exiting after successful startup seems to be a good idea instead of having opportunities for silent failure.

[Brian Aker (brianaker)]

1) Code style is off.
2) What happens if someone does a --help and calls the daemon at the same time?

[Stewart Smith (stewart)]

so it also looks like we create the pid file at a bit of an odd time.

Maybe we could write some tests for this in the new test thing dbqp or whatever it's called that i can't remember :)

[Patrick Crews (patrick-crews)]

Did some manual testing of the attached branch and things worked as expected.
This was largely cursory (startup / shutdown / basic stuff), but I'm satisfied that this works

[Patrick Crews (patrick-crews)]

Have a few more testcases to run through - will have them done in the am. Apologies for the delay, but Brian pointed out a few areas to poke at ; )

[Patrick Crews (patrick-crews)]

Tests fine, parent id is apparently killed off once server is started, killing server is fine, calling --shutdown via drizzle client is fine. Everything is looking a-ok.

[Lee Bieber (kalebral-deactivatedaccount)]

Fails to build on freebsd 8.0

g++44 -DHAVE_CONFIG_H -I. -I. -g -isystem /usr/local/include -I/usr/local/include -D_THREAD_SAFE -pthread -pipe -std=gnu++98 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Werror -pedantic -Wall -Wundef -Wshadow -fdiagnostics-show-option -fno-strict-aliasing -Wno-strict-aliasing -Wextra -Wformat -Wno-format-nonliteral -Wno-format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long -Wmissing-declarations -Wframe-larger-than=32768 -Wno-redundant-decls -D_THREAD_SAFE -pthread -MT drizzled/message/cache.o -MD -MP -MF $depbase.Tpo -c -o drizzled/message/cache.o drizzled/message/cache.cc &&\
 mv -f $depbase.Tpo $depbase.Po
drizzled/main.cc: In function 'int main(int, char**)':
drizzled/main.cc:261: error: 'sigignore' was not declared in this scope

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-freebsd-8.0/1326/console

review: Needs Fixing

[Stewart Smith (stewart)]

latest commit should fix it.

[lp:~stewart/drizzle/bbug565053-daemon]

2139. By Stewart Smith on 2011-02-10

using signal() instead of sigignore() as it's compatible with FreeBSD < 8.1

=== added file 'drizzled/daemon.c'
--- drizzled/daemon.c	1970-01-01 00:00:00 +0000
+++ drizzled/daemon.c	2011-02-10 23:44:44 +0000
@@ -0,0 +1,138 @@
+/*    $Header: /cvsroot/wikipedia/willow/src/bin/willow/daemon.c,v 1.1 2005/05/02 19:15:21 kateturner Exp $    */
+/*    $NetBSD: daemon.c,v 1.9 2003/08/07 16:42:46 agc Exp $    */
+/*-
+ * Copyright (c) 1990, 1993
+ *    The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2010
+ *    Stewart Smith
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined __SUNPRO_C || defined __DECC || defined __HP_cc
+# pragma ident "@(#)$Header: /cvsroot/wikipedia/willow/src/bin/willow/daemon.c,v 1.1 2005/05/02 19:15:21 kateturner Exp $"
+# pragma ident "$NetBSD: daemon.c,v 1.9 2003/08/07 16:42:46 agc Exp $"
+#endif
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/select.h>
+
+int daemonize(int nochdir, int noclose, int wait_sigusr1);
+int daemon_is_ready(void);
+void sigusr1_handler(int sig);
+
+pid_t parent_pid;
+
+void sigusr1_handler(int sig)
+{
+  if (sig == SIGUSR1)
+    _exit(EXIT_SUCCESS);
+}
+
+int daemon_is_ready()
+{
+  kill(parent_pid, SIGUSR1);
+  return 0;
+}
+
+int daemonize(int nochdir, int noclose, int wait_sigusr1)
+{
+    int fd;
+    pid_t child= -1;
+
+    parent_pid= getpid();
+    signal(SIGUSR1, sigusr1_handler);
+
+    child= fork();
+
+    switch (child)
+    {
+    case -1:
+        return (-1);
+    case 0:
+        break;
+    default:
+      if (wait_sigusr1)
+      {
+        /* parent */
+        int exit_code= -1;
+        int status;
+        while (waitpid(child, &status, 0) != child);
+        if (WIFEXITED(status))
+        {
+          exit_code= WEXITSTATUS(status);
+        }
+        if (WIFSIGNALED(status))
+        {
+          exit_code= -1;
+        }
+        _exit(exit_code);
+      }
+      else
+      {
+        _exit(EXIT_SUCCESS);
+      }
+    }
+
+    /* child */
+    if (setsid() == -1)
+        return (-1);
+
+    if (nochdir == 0) {
+        if(chdir("/") != 0) {
+            perror("chdir");
+            return (-1);
+        }
+    }
+
+    if (noclose == 0 && (fd = open("/dev/null", O_RDWR, 0)) != -1) {
+        if(dup2(fd, STDIN_FILENO) < 0) {
+            perror("dup2 stdin");
+            return (-1);
+        }
+        if(dup2(fd, STDOUT_FILENO) < 0) {
+            perror("dup2 stdout");
+            return (-1);
+        }
+        if(dup2(fd, STDERR_FILENO) < 0) {
+            perror("dup2 stderr");
+            return (-1);
+        }
+
+        if (fd > STDERR_FILENO) {
+            if(close(fd) < 0) {
+                perror("close");
+                return (-1);
+            }
+        }
+    }
+    return (0);
+}

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2011-02-09 15:07:26 +0000
+++ drizzled/drizzled.cc	2011-02-10 23:44:44 +0000
@@ -158,6 +158,7 @@
 namespace po=boost::program_options;
 namespace dpo=drizzled::program_options;
 
+bool opt_daemon= false;
 
 namespace drizzled
 {
@@ -1084,7 +1085,7 @@
   }
 }
 
-int init_common_variables(int argc, char **argv, module::Registry &plugins)
+int init_basic_variables(int argc, char **argv)
 {
   time_t curr_time;
   umask(((~internal::my_umask) & 0666));
@@ -1134,6 +1135,8 @@
   config_options.add_options()
   ("help,?", po::value<bool>(&opt_help)->default_value(false)->zero_tokens(),
   _("Display this help and exit."))
+  ("daemon,d", po::value<bool>(&opt_daemon)->default_value(false)->zero_tokens(),
+  _("Run as a daemon."))
   ("no-defaults", po::value<bool>()->default_value(false)->zero_tokens(),
   _("Configuration file defaults are not used if no-defaults is set"))
   ("defaults-file", po::value<vector<string> >()->composing()->notifier(&compose_defaults_file_list),
@@ -1409,6 +1412,15 @@
     unireg_abort(1);
   }
 
+  return 0;
+}
+
+int init_remaining_variables(module::Registry &plugins)
+{
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
+  current_pid= getpid();		/* Save for later ref */
+
   /* At this point, we've read all the options we need to read from files and
      collected most of them into unknown options - now let's load everything
   */
@@ -1488,7 +1500,6 @@
 
   fix_paths();
 
-  current_pid= getpid();		/* Save for later ref */
   init_time();				/* Init time-functions (read zone) */
 
   if (item_create_init())
@@ -1723,6 +1734,9 @@
   {"help", '?', N_("Display this help and exit."),
    (char**) &opt_help, (char**) &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
    0, 0},
+  {"daemon", 'd', N_("Run as daemon."),
+   (char**) &opt_daemon, (char**) &opt_daemon, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
+   0, 0},
   {"auto-increment-increment", OPT_AUTO_INCREMENT,
    N_("Auto-increment columns are incremented by this"),
    (char**) &global_system_variables.auto_increment_increment,

=== modified file 'drizzled/drizzled.h'
--- drizzled/drizzled.h	2011-01-24 05:33:52 +0000
+++ drizzled/drizzled.h	2011-02-10 23:44:44 +0000
@@ -60,7 +60,8 @@
 
 int init_thread_environment();
 int init_server_components(module::Registry &modules);
-int init_common_variables(int argc, char **argv, module::Registry &modules);
+int init_basic_variables(int argc, char **argv);
+int init_remaining_variables(module::Registry &modules);
 
 passwd *check_user(const char *user);
 void set_user(const char *user, passwd *user_info_arg);

=== modified file 'drizzled/identifier/schema.cc'
--- drizzled/identifier/schema.cc	2011-02-07 01:54:33 +0000
+++ drizzled/identifier/schema.cc	2011-02-10 23:44:44 +0000
@@ -44,7 +44,6 @@
 {
 
 extern string drizzle_tmpdir;
-extern pid_t current_pid;
 
 static size_t build_schema_filename(string &path, const string &db)
 {

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2011-02-04 09:29:39 +0000
+++ drizzled/include.am	2011-02-10 23:44:44 +0000
@@ -725,6 +725,7 @@
 			   drizzled/locking/global.cc \
 			   drizzled/lookup_symbol.cc \
 			   drizzled/main.cc \
+			   drizzled/daemon.c \
 			   drizzled/message.cc \
 			   drizzled/message/cache.cc \
 			   drizzled/message/catalog.cc \

=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2011-02-05 20:36:14 +0000
+++ drizzled/main.cc	2011-02-10 23:44:44 +0000
@@ -68,6 +68,9 @@
 
 #include "drizzled/util/backtrace.h"
 
+extern "C" int daemonize(int nochdir, int noclose, int wait_sigusr1);
+extern "C" int daemon_is_ready(void);
+
 using namespace drizzled;
 using namespace std;
 namespace fs=boost::filesystem;
@@ -75,6 +78,8 @@
 static pthread_t select_thread;
 static uint32_t thr_kill_signal;
 
+extern bool opt_daemon;
+
 
 /**
   All global error messages are sent here where the first one is stored
@@ -245,9 +250,26 @@
 
   /* Function generates error messages before abort */
   error_handler_hook= my_message_sql;
+
   /* init_common_variables must get basic settings such as data_home_dir
      and plugin_load_list. */
-  if (init_common_variables(argc, argv, modules))
+  if (init_basic_variables(argc, argv))
+    unireg_abort(1);				// Will do exit
+
+  if (opt_daemon)
+  {
+    if (signal(SIGHUP, SIG_IGN) == SIG_ERR)
+    {
+      perror("Failed to ignore SIGHUP");
+    }
+    if (daemonize(1, 1, 1) == -1)
+    {
+      fprintf(stderr, "failed to daemon() in order to daemonize\n");
+      exit(EXIT_FAILURE);
+    }
+  }
+
+  if (init_remaining_variables(modules))
     unireg_abort(1);				// Will do exit
 
   /*
@@ -361,6 +383,8 @@
     }
   }
 
+  if (opt_daemon)
+    daemon_is_ready();
 
   /* 
     Listen for new connections and start new session for each connection

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2011-01-24 21:05:10 +0000
+++ drizzled/sql_table.cc	2011-02-10 23:44:44 +0000
@@ -58,8 +58,6 @@
 namespace drizzled
 {
 
-extern pid_t current_pid;
-
 bool is_primary_key(KeyInfo *key_info)
 {
   static const char * primary_key_name="PRIMARY";

=== modified file 'drizzled/table.cc'
--- drizzled/table.cc	2011-02-04 21:25:07 +0000
+++ drizzled/table.cc	2011-02-10 23:44:44 +0000
@@ -63,7 +63,6 @@
 namespace drizzled
 {
 
-extern pid_t current_pid;
 extern plugin::StorageEngine *heap_engine;
 extern plugin::StorageEngine *myisam_engine;