X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=25da72c6ff2e410f420a119959f6c26c60e6f18c;hb=24ce539ecb81145bad8e57e6f9c288adfbd71fac;hp=8203de9d5b46854268d7fd5f8695fa8db8db24bc;hpb=015b6142ad6c3b496437d397416aacb776a42aed;p=awesomized%2Flibmemcached diff --git a/libtest/server_container.cc b/libtest/server_container.cc index 8203de9d..25da72c6 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -1,28 +1,43 @@ /* 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 "libtest/yatlcon.h" + +#include "libtest/common.h" -#include #include #include #include @@ -40,13 +55,15 @@ static inline std::string &rtrim(std::string &s) namespace libtest { +Server* server_startup_st::last() +{ + return servers.back(); +} + void server_startup_st::push_server(Server *arg) { servers.push_back(arg); - char port_str[NI_MAXSERV]; - snprintf(port_str, sizeof(port_str), "%u", int(arg->port())); - std::string server_config_string; if (arg->has_socket()) { @@ -58,15 +75,18 @@ void server_startup_st::push_server(Server *arg) } else { + libtest::vchar_t port_str; + port_str.resize(NI_MAXSERV); + snprintf(&port_str[0], port_str.size(), "%u", int(arg->port())); + server_config_string+= "--server="; server_config_string+= arg->hostname(); server_config_string+= ":"; - server_config_string+= port_str; + server_config_string+= &port_str[0]; server_config_string+= " "; } server_list+= server_config_string; - } Server* server_startup_st::pop_server() @@ -76,13 +96,14 @@ Server* server_startup_st::pop_server() return tmp; } -bool server_startup_st::shutdown(uint32_t number_of_host) +// host_to_shutdown => host number to shutdown in array +bool server_startup_st::shutdown(uint32_t host_to_shutdown) { - if (servers.size() > number_of_host) + if (servers.size() > host_to_shutdown) { - Server* tmp= servers[number_of_host]; + Server* tmp= servers[host_to_shutdown]; - if (tmp and tmp->has_pid() and tmp->kill() == false) + if (tmp and tmp->kill() == false) { } else { @@ -93,19 +114,16 @@ bool server_startup_st::shutdown(uint32_t number_of_host) return false; } -void server_startup_st::shutdown_and_remove() +void server_startup_st::clear() { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) - { - delete *iter; - } + std::for_each(servers.begin(), servers.end(), DeleteFromVector()); servers.clear(); } bool server_startup_st::check() const { bool success= true; - for (std::vector::const_iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::const_iterator iter= servers.begin(); iter != servers.end(); ++iter) { if ((*iter)->check() == false) { @@ -119,7 +137,7 @@ bool server_startup_st::check() const bool server_startup_st::shutdown() { bool success= true; - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { if ((*iter)->has_pid() and (*iter)->kill() == false) { @@ -133,9 +151,14 @@ bool server_startup_st::shutdown() void server_startup_st::restart() { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + for (std::vector::iterator iter= servers.begin(); iter != servers.end(); ++iter) { - (*iter)->start(); + Server *server = *iter; + + if (server->check()) { + server->kill(); + } + server->start(); } } @@ -144,14 +167,13 @@ server_startup_st::server_startup_st() : _magic(MAGIC_MEMORY), _socket(false), _sasl(false), - _count(0), udp(0), _servers_to_run(5) { } server_startup_st::~server_startup_st() { - shutdown_and_remove(); + clear(); } bool server_startup_st::validate() @@ -159,30 +181,58 @@ bool server_startup_st::validate() return _magic == MAGIC_MEMORY; } -bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message) +bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, const char *argv[]) { - if (try_port <= 0) + return construct.start_server(server_type, try_port, argv); +} + +libtest::Server* server_startup_st::create(const std::string& server_type, in_port_t try_port, const bool is_socket) +{ + libtest::Server *server= NULL; + + if (is_socket == false) { - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port)); + if (try_port <= 0) + { + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port)); + } } - libtest::Server *server= NULL; - if (0) - { } + if (is_socket) + { + if (server_type.compare("memcached") == 0) + { + server= build_memcached_socket("localhost", try_port); + } + else + { + Error << "Socket is not support for server: " << server_type; + return NULL; + } + } else if (server_type.compare("gearmand") == 0) { - if (GEARMAND_BINARY) + server= build_gearmand("localhost", try_port); + } + else if (server_type.compare("hostile-gearmand") == 0) + { + server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand"); + } + else if (server_type.compare("drizzled") == 0) + { + if (has_drizzled()) { - if (HAVE_LIBGEARMAN) + if (has_libdrizzle()) { - server= build_gearmand("localhost", try_port); + server= build_drizzled("localhost", try_port); } } } else if (server_type.compare("blobslap_worker") == 0) { - if (GEARMAND_BINARY) + if (has_gearmand()) { +#ifdef GEARMAND_BLOBSLAP_WORKER if (GEARMAND_BLOBSLAP_WORKER) { if (HAVE_LIBGEARMAN) @@ -190,185 +240,152 @@ bool server_startup(server_startup_st& construct, const std::string& server_type server= build_blobslap_worker(try_port); } } - } - } - else if (server_type.compare("memcached-sasl") == 0) - { - if (MEMCACHED_SASL_BINARY) - { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password()); - } +#endif // GEARMAND_BLOBSLAP_WORKER } } else if (server_type.compare("memcached") == 0) { - if (MEMCACHED_BINARY) + if (has_memcached()) { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached("localhost", try_port); - } - } - } - else if (server_type.compare("memcached-light") == 0) - { - if (MEMCACHED_LIGHT_BINARY) - { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached_light("localhost", try_port); - } + server= build_memcached("localhost", try_port); } } - if (server == NULL) - { - fatal_message("Launching of an unknown server was attempted"); - } + return server; +} - /* - We will now cycle the server we have created. - */ - if (server->cycle() == false) +class ServerPtr { +public: + ServerPtr(libtest::Server* server_): + _server(server_) + { } + + ~ServerPtr() { - Error << "Could not start up server " << *server; - delete server; - return false; + delete _server; } - server->build(argc, argv); - - if (gdb_is_caller() and false) + void reset() { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; -#if 0 - Out << "run " << server->args(options); -#endif - getchar(); + delete _server; + _server= NULL; } - else if (server->start() == false) + + libtest::Server* release(libtest::Server* server_= NULL) { - delete server; - return false; + libtest::Server* tmp= _server; + _server= server_; + return tmp; } - else + + libtest::Server* operator->() const { - if (opt_startup_message) - { - Outn(); - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - Outn(); - } + return _server; } - construct.push_server(server); + libtest::Server* operator&() const + { + return _server; + } - return true; -} +private: + libtest::Server* _server; +}; -bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]) +bool server_startup_st::_start_server(const bool is_socket, + const std::string& server_type, + in_port_t try_port, + const char *argv[]) { - (void)try_port; - Outn(); + try { + ServerPtr server(create(server_type, try_port, is_socket)); - Server *server= NULL; - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { - Error << "Socket files are not supported for gearmand yet"; - } - else if (server_type.compare("memcached-sasl") == 0) - { - if (MEMCACHED_SASL_BINARY) + if (&server == NULL) { - if (HAVE_LIBMEMCACHED) - { - server= build_memcached_sasl_socket("localhost", try_port, username(), password()); - } - else - { - Error << "Libmemcached was not found"; - } + Error << "Could not allocate server: " << server_type; + return false; } - else + + /* + We will now cycle the server we have created. + */ + if (server->cycle() == false) { - Error << "No memcached binary is available"; + Error << "Could not start up server " << &server; + return false; } - } - else if (server_type.compare("memcached") == 0) - { - if (MEMCACHED_BINARY) + + server->init(argv); + +#if 0 + if (false) { - if (HAVE_LIBMEMCACHED) + Out << "Pausing for startup, hit return when ready."; + std::string gdb_command= server->base_command(); + getchar(); + } + else +#endif + + if (server->start() == false) { - server= build_memcached_socket("localhost", try_port); + return false; } else { - Error << "Libmemcached was not found"; + { +#ifdef DEBUG + if (DEBUG) + { + Outn(); + Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + } +#endif + } } - } - else + + push_server(server.release()); + + if (is_socket and &server) { - Error << "No memcached binary is available"; + set_default_socket(server->socket().c_str()); } } - else + catch (const libtest::disconnected& err) { - Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; + if (fatal::is_disabled() == false and try_port != LIBTEST_FAIL_PORT) + { + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + return false; + } } - - if (server == NULL) + catch (const libtest::__test_result& err) { - Error << "Failure occured while creating server: " << server_type; + stream::cerr(err.file(), err.line(), err.func()) << err.what(); return false; } - - /* - We will now cycle the server we have created. - */ - if (server->cycle() == false) + catch (const std::exception& err) { - Error << "Could not start up server " << *server; - delete server; + Error << err.what(); return false; } - - server->build(argc, argv); - - if (gdb_is_caller() and false) + catch (...) { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; -#if 0 - Out << "run " << server->args(options); -#endif - getchar(); - } - else if (server->start() == false) - { - Error << "Failed to start " << *server; - delete server; + Error << "error occured while creating server: " << server_type; return false; } - else - { - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - } - push_server(server); - - set_default_socket(server->socket().c_str()); + return true; +} - Outn(); +bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, const char *argv[]) +{ + return _start_server(false, server_type, try_port, argv); +} - return true; +bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, const char *argv[]) +{ + return _start_server(true, server_type, try_port, argv); } std::string server_startup_st::option_string() const