X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=61f8e9835cb29f9e48c6e613a8b8609a6c2d97ab;hb=bf755bec1cd09fad086a47650c1a725c9fbc7eb1;hp=66575e74300725dd93b9327be6e339d3682cb649;hpb=53c5e334c2810febf02a2e6a826b3735f33593ee;p=m6w6%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index 66575e74..61f8e983 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -1,35 +1,52 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * 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. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include #include #include +#include #include #include #include #include #include +#include // trim from end static inline std::string &rtrim(std::string &s) @@ -65,7 +82,7 @@ std::ostream& operator<<(std::ostream& output, const Server &arg) output << " Socket:" << arg.socket(); } - if (not arg.running().empty()) + if (arg.running().empty() == false) { output << " Exec:" << arg.running(); } @@ -73,20 +90,34 @@ std::ostream& operator<<(std::ostream& output, const Server &arg) return output; // for multiple << operators } -Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : +#define MAGIC_MEMORY 123570 + +Server::Server(const std::string& host_arg, const in_port_t port_arg, + const std::string& executable, const bool _is_libtool, + bool is_socket_arg) : + _magic(MAGIC_MEMORY), _is_socket(is_socket_arg), - _pid(-1), _port(port_arg), - _hostname(host_arg) + _hostname(host_arg), + _app(executable, _is_libtool), + out_of_ban_killed_(false) { } Server::~Server() { - if (has_pid() and not kill(_pid)) - { - Error << "Unable to kill:" << *this; - } +} + +bool Server::check() +{ + _app.slurp(); + _app.check(); + return true; +} + +bool Server::validate() +{ + return _magic == MAGIC_MEMORY; } // If the server exists, kill it @@ -95,12 +126,12 @@ bool Server::cycle() uint32_t limit= 3; // Try to ping, and kill the server #limit number of times - pid_t current_pid; - while (--limit and is_pid_valid(current_pid= get_pid())) + while (--limit and + is_pid_valid(_app.pid())) { - if (kill(current_pid)) + if (kill()) { - Log << "Killed existing server," << *this << " with pid:" << current_pid; + Log << "Killed existing server," << *this; dream(0, 50000); continue; } @@ -109,7 +140,7 @@ bool Server::cycle() // For whatever reason we could not kill it, and we reached limit if (limit == 0) { - Error << "Reached limit, could not kill server pid:" << current_pid; + Error << "Reached limit, could not kill server"; return false; } @@ -123,80 +154,154 @@ bool Server::wait_for_pidfile() const return wait.successful(); } +bool Server::has_pid() const +{ + return (_app.pid() > 1); +} + + bool Server::start() { // If we find that we already have a pid then kill it. - if (has_pid() and kill(_pid) == false) + if (has_pid() == true) { - Error << "Could not kill() existing server during start() pid:" << _pid; - return false; +#if 0 + fatal_message("has_pid() failed, programer error"); +#endif } - if (has_pid() == false) + // This needs more work. +#if 0 + if (gdb_is_caller()) { - fatal_message("has_pid() failed, programer error"); + _app.use_gdb(); } +#endif - Application app(executable(), is_libtool()); - if (args(app) == false) + if (getenv("YATL_PTRCHECK_SERVER")) { - Error << "Could not build command()"; - return false; + _app.use_ptrcheck(); + } + else if (getenv("YATL_VALGRIND_SERVER")) + { + _app.use_valgrind(); } - Application::error_t ret; - if (Application::SUCCESS != (ret= app.run())) + if (args(_app) == false) { - Error << "Application::run() " << ret; + Error << "Could not build command()"; return false; } - _running= app.print(); - if (Application::SUCCESS != (ret= app.wait())) + libtest::release_port(_port); + Application::error_t ret; + if (Application::SUCCESS != (ret= _app.run())) { - Error << "Application::wait() " << app.print() << " " << ret; + Error << "Application::run() " << ret; return false; } + _running= _app.print(); - if (is_helgrind() or is_valgrind()) + if (valgrind_is_caller()) { dream(5, 50000); } - if (pid_file().empty() == false) + size_t repeat= 5; + _app.slurp(); + while (--repeat) { - Wait wait(pid_file(), 8); - - if (not wait.successful()) + if (pid_file().empty() == false) { - Error << "Unable to open pidfile for: " << _running; + Wait wait(pid_file(), 8); + + if (wait.successful() == false) + { + if (_app.check()) + { + _app.slurp(); + continue; + } + + char buf[PATH_MAX]; + char *getcwd_buf= getcwd(buf, sizeof(buf)); + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Unable to open pidfile in %s for: %s stderr:%s", + getcwd_buf ? getcwd_buf : "", + _running.c_str(), + _app.stderr_c_str()); + } } } - int counter= 0; + uint32_t this_wait= 0; bool pinged= false; - while ((pinged= ping()) == false and - counter < (is_helgrind() or is_valgrind() ? 20 : 5)) { - dream(counter++, 50000); + uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow) + uint32_t waited; + uint32_t retry; + + for (waited= 0, retry= 1; ; retry++, waited+= this_wait) + { + if ((pinged= ping()) == true) + { + break; + } + else if (waited >= timeout) + { + break; + } + + this_wait= retry * retry / 3 + 1; + libtest::dream(this_wait, 0); + } } if (pinged == false) { // If we happen to have a pid file, lets try to kill it - if (pid_file().empty() == false) + if ((pid_file().empty() == false) and (access(pid_file().c_str(), R_OK) == 0)) { - Error << "We are going to kill it off"; - kill_file(pid_file()); + _app.slurp(); + if (kill_file(pid_file()) == false) + { + libtest::fatal err(LIBYATL_DEFAULT_PARAM, + "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); + + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + } + else + { + libtest::fatal err(LIBYATL_DEFAULT_PARAM, + "Failed native ping(), pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s", + int(_app.pid()), + _app.check() ? "true" : "false", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); + + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + } + } + else + { + libtest::fatal err(LIBYATL_DEFAULT_PARAM, + "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s", + int(_app.pid()), + _app.check() ? "true" : "false", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); + + stream::cerr(err.file(), err.line(), err.func()) << err.what(); } - Error << "Failed to ping() server started with:" << _running; _running.clear(); return false; } - // A failing get_pid() at this point is considered an error - _pid= get_pid(true); - return has_pid(); } @@ -204,12 +309,11 @@ void Server::reset_pid() { _running.clear(); _pid_file.clear(); - _pid= -1; } -pid_t Server::pid() +pid_t Server::pid() const { - return _pid; + return _app.pid(); } void Server::add_option(const std::string& arg) @@ -267,8 +371,7 @@ bool Server::set_pid_file() int fd; if ((fd= mkstemp(file_buffer)) == -1) { - perror(file_buffer); - return false; + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); } close(fd); unlink(file_buffer); @@ -287,8 +390,7 @@ bool Server::set_log_file() int fd; if ((fd= mkstemp(file_buffer)) == -1) { - perror(file_buffer); - return false; + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); } close(fd); @@ -301,13 +403,9 @@ bool Server::args(Application& app) { // Set a log file if it was requested (and we can) - if (getenv("LIBTEST_LOG") and has_log_file_option()) + if (has_log_file_option()) { - if (not set_log_file()) - { - return false; - } - + set_log_file(); log_file_option(app, _log_file); } @@ -326,12 +424,6 @@ bool Server::args(Application& app) pid_file_option(app, pid_file()); } - assert(daemon_file_option()); - if (daemon_file_option() and not is_valgrind() and not is_helgrind()) - { - app.add_option(daemon_file_option()); - } - if (has_socket_file_option()) { if (set_socket_file() == false) @@ -347,7 +439,7 @@ bool Server::args(Application& app) port_option(app, _port); } - for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++) + for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter) { if ((*iter).second.empty() == false) { @@ -362,25 +454,11 @@ bool Server::args(Application& app) return true; } -bool Server::is_debug() const -{ - return bool(getenv("LIBTEST_MANUAL_GDB")); -} - -bool Server::is_valgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_VALGRIND")); -} - -bool Server::is_helgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_HELGRIND")); -} - -bool Server::kill(pid_t pid_arg) +bool Server::kill() { - if (check_pid(pid_arg) and kill_pid(pid_arg)) // If we kill it, reset + if (check_pid(_app.pid())) // If we kill it, reset { + _app.murder(); if (broken_pid_file() and pid_file().empty() == false) { unlink(pid_file().c_str());