X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=68a463b889e9628536f7f1d32439ded4a9110f3b;hb=1d3ffcb8031a12f06404a0700d556901b773c409;hp=da341f9528d5c08bebeea22524a3ec9adf695cf5;hpb=675ac17fddca229e391d80eb610959d9c53db6e5;p=m6w6%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index da341f95..68a463b8 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -1,36 +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) @@ -81,7 +97,6 @@ Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : _magic(MAGIC_MEMORY), _is_socket(is_socket_arg), - _pid(-1), _port(port_arg), _hostname(host_arg), _app(executable, _is_libtool) @@ -95,7 +110,8 @@ Server::~Server() bool Server::check() { _app.slurp(); - return _app.check(); + _app.check(); + return true; } bool Server::validate() @@ -132,23 +148,30 @@ bool Server::cycle() bool Server::wait_for_pidfile() const { - Wait wait(pid_file(), 4); + if (has_pid_file()) + { + Wait wait(pid_file(), 4); - return wait.successful(); + return wait.successful(); + } + + return true; } bool Server::has_pid() const { - return (_pid > 1); + return (_app.pid() > 1); } bool Server::start() { // If we find that we already have a pid then kill it. - if (has_pid() == false) + if (has_pid() == true) { +#if 0 fatal_message("has_pid() failed, programer error"); +#endif } // This needs more work. @@ -159,12 +182,22 @@ bool Server::start() } #endif + if (getenv("YATL_PTRCHECK_SERVER")) + { + _app.use_ptrcheck(); + } + else if (getenv("YATL_VALGRIND_SERVER")) + { + _app.use_valgrind(); + } + if (args(_app) == false) { Error << "Could not build command()"; return false; } + libtest::release_port(_port); Application::error_t ret; if (Application::SUCCESS != (ret= _app.run())) { @@ -178,19 +211,37 @@ bool Server::start() dream(5, 50000); } - if (pid_file().empty() == false) + _app.slurp(); + if (has_pid_file()) { - Wait wait(pid_file(), 8); - - if (wait.successful() == false) + size_t repeat= 5; + while (--repeat) { - libtest::fatal(LIBYATL_DEFAULT_PARAM, - "Unable to open pidfile for: %s", - _running.c_str()); + if (pid_file().empty() == false) + { + 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()); + } + } } } - uint32_t this_wait; + uint32_t this_wait= 0; bool pinged= false; { uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow) @@ -216,27 +267,40 @@ bool Server::start() 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)) { + _app.slurp(); if (kill_file(pid_file()) == false) { - fatal_message("Failed to kill off server after startup occurred, when pinging failed"); + throw libtest::fatal(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()); } - Error << "Failed to ping(), waited:" << this_wait - << " server started, having pid_file. exec:" << _running - << " error:" << _app.stderr_result(); + + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Failed native ping(), pid: %d is 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()); } else { - Error << "Failed to ping() server started. exec:" << _running; + throw libtest::fatal(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()); } _running.clear(); return false; } - // A failing get_pid() at this point is considered an error - _pid= get_pid(true); - return has_pid(); } @@ -244,12 +308,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) @@ -307,8 +370,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); @@ -327,7 +389,7 @@ bool Server::set_log_file() int fd; if ((fd= mkstemp(file_buffer)) == -1) { - libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); } close(fd); @@ -352,6 +414,7 @@ bool Server::args(Application& app) } // Update pid_file + if (has_pid_file()) { if (_pid_file.empty() and set_pid_file() == false) { @@ -393,8 +456,9 @@ bool Server::args(Application& app) bool Server::kill() { - if (check_pid(_app.pid()) and kill_pid(_app.pid())) // 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());