X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=7af26092c650a12be452f1af98ead09b1cba971f;hb=b220134a312e2a488810abfef510f5dbf59078a4;hp=daf6787cf69b9c86bd2afaaefe2b58772c2b47d8;hpb=6949713f6af6882749d4827e6af46c3ca7c3e8ff;p=awesomized%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index daf6787c..7af26092 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -1,31 +1,42 @@ /* 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 "libtest/yatlcon.h" -#include - -#include -#include - -using namespace libtest; +#include "libtest/common.h" #include #include @@ -47,7 +58,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -using namespace libtest; +namespace libtest { class Memcached : public libtest::Server { @@ -55,14 +66,20 @@ class Memcached : public libtest::Server std::string _password; public: - Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg, const std::string& username_arg, const std::string& password_arg) : - libtest::Server(host_arg, port_arg, is_socket_arg), + Memcached(const std::string& host_arg, + const in_port_t port_arg, + const bool is_socket_arg, + const std::string& username_arg, + const std::string& password_arg) : + libtest::Server(host_arg, port_arg, + memcached_binary(), false, is_socket_arg), _username(username_arg), _password(password_arg) { } Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) : - libtest::Server(host_arg, port_arg, is_socket_arg) + libtest::Server(host_arg, port_arg, + memcached_binary(), false, is_socket_arg) { set_pid_file(); } @@ -82,67 +99,29 @@ public: return _username; } - pid_t get_pid(bool error_is_ok) + bool wait_for_pidfile() const { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) - { - if (error_is_ok and not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } - } + Wait wait(pid(), 4); - pid_t local_pid; - memcached_return_t rc= MEMCACHED_SUCCESS; - if (has_socket()) - { - local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc); - } - else - { - local_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc); - } - - if (error_is_ok and ((memcached_failed(rc) or not is_pid_valid(local_pid)))) - { - Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << local_pid << " for:" << *this; - } - - return local_pid; + return wait.successful(); } bool ping() { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (out_of_ban_killed()) { - if (not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } + return false; } - memcached_return_t rc; - bool ret; - - if (has_socket()) - { - ret= libmemcached_util_ping(socket().c_str(), 0, &rc); - } - else + if (is_socket()) { - ret= libmemcached_util_ping(hostname().c_str(), port(), &rc); + return _app.check(); } - if (memcached_failed(rc) or not ret) - { - Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc); - } + SimpleClient client(_hostname, _port); - return ret; + std::string response; + return client.send_message("version", response); } const char *name() @@ -152,12 +131,20 @@ public: const char *executable() { - return MEMCACHED_BINARY; + return memcached_binary(); + } + + bool is_libtool() + { + return false; } - const char *pid_file_option() + virtual void pid_file_option(Application& app, const std::string& arg) { - return "-P "; + if (arg.empty() == false) + { + app.add_option("-P", arg); + } } const char *socket_file_option() const @@ -165,24 +152,30 @@ public: return "-s "; } - const char *daemon_file_option() + virtual void port_option(Application& app, in_port_t arg) { - return "-d"; + char buffer[30]; + snprintf(buffer, sizeof(buffer), "%d", int(arg)); + app.add_option("-p", buffer); + app.add_option("-U", buffer); } - const char *log_file_option() + bool has_port_option() const { - return NULL; + return true; } - const char *port_option() + bool has_socket_file_option() const { - return "-p "; + return has_socket(); } - bool is_libtool() + void socket_file_option(Application& app, const std::string& socket_arg) { - return false; + if (socket_arg.empty() == false) + { + app.add_option("-s", socket_arg); + } } bool broken_socket_cleanup() @@ -196,159 +189,54 @@ public: return true; } - bool build(int argc, const char *argv[]); -}; - -class MemcachedSaSL : public Memcached -{ -public: - MemcachedSaSL(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg, const std::string& username_arg, const std::string &password_arg) : - Memcached(host_arg, port_arg, is_socket_arg, username_arg, password_arg) - { } - - const char *name() - { - return "memcached-sasl"; - }; - - const char *sasl() const - { - return " -S -B binary "; - } - - const char *executable() - { - return MEMCACHED_SASL_BINARY; - } - - pid_t get_pid(bool error_is_ok) - { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) - { - if (error_is_ok and not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } - } - - pid_t local_pid; - memcached_return_t rc; - if (has_socket()) - { - local_pid= libmemcached_util_getpid2(socket().c_str(), 0, username().c_str(), password().c_str(), &rc); - } - else - { - local_pid= libmemcached_util_getpid2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc); - } - - if (error_is_ok and ((memcached_failed(rc) or not is_pid_valid(local_pid)))) - { - Error << "libmemcached_util_getpid2(" << memcached_strerror(NULL, rc) << ") username: " << username() << " password: " << password() << " pid: " << local_pid << " for:" << *this; - } - - return local_pid; - } - - bool ping() - { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) - { - if (not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } - } - - memcached_return_t rc; - bool ret; - - if (has_socket()) - { - ret= libmemcached_util_ping2(socket().c_str(), 0, username().c_str(), password().c_str(), &rc); - } - else - { - ret= libmemcached_util_ping2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc); - } - - if (memcached_failed(rc) or not ret) - { - Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc); - } - - return ret; - } - + bool build(); }; #include -bool Memcached::build(int argc, const char *argv[]) +bool Memcached::build() { - std::stringstream arg_buffer; - if (getuid() == 0 or geteuid() == 0) { - arg_buffer << " -u root "; + add_option("-u", "root"); } - arg_buffer << " -l 127.0.0.1 "; - arg_buffer << " -m 128 "; - arg_buffer << " -M "; + add_option("-l", "localhost"); +#ifdef __APPLE__ +#else + add_option("-m", "128"); + add_option("-M"); +#endif if (sasl()) { - arg_buffer << sasl(); - } - - for (int x= 1 ; x < argc ; x++) - { - arg_buffer << " " << argv[x] << " "; + add_option(sasl()); } - set_extra_args(arg_buffer.str()); + add_option("-vv"); return true; } -namespace libtest { - libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port) { - return new Memcached(hostname, try_port, false); -} - -libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port) -{ - return new Memcached(socket_file, try_port, true); -} - - -libtest::Server *build_memcached_sasl(const std::string& hostname, const in_port_t try_port, const std::string& username, const std::string &password) -{ - if (username.empty()) + if (has_memcached()) { - return new MemcachedSaSL(hostname, try_port, false, "memcached", "memcached"); + return new Memcached(hostname, try_port, false); } - return new MemcachedSaSL(hostname, try_port, false, username, password); + return NULL; } -libtest::Server *build_memcached_sasl_socket(const std::string& socket_file, const in_port_t try_port, const std::string& username, const std::string &password) +libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port) { - if (username.empty()) + if (has_memcached()) { - return new MemcachedSaSL(socket_file, try_port, true, "memcached", "memcached"); + return new Memcached(socket_file, try_port, true); } - return new MemcachedSaSL(socket_file, try_port, true, username, password); -} - + return NULL; } +} // namespace libtest