X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=d92944f6bfeb1bd9cec17320229cd880f3edb6f6;hb=bf755bec1cd09fad086a47650c1a725c9fbc7eb1;hp=c5358bf53fa5da4bdf4b6b7c68f777bddd87c873;hpb=93dec285cdb4aab2bff0bae0d50e033b69560181;p=m6w6%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index c5358bf5..d92944f6 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -1,25 +1,40 @@ /* 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 @@ -49,20 +64,38 @@ using namespace libtest; using namespace libtest; +namespace { + bool is_memcached_libtool() + { + if (MEMCACHED_BINARY and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0) + { + return true; + } + + return false; + } +} + class Memcached : public libtest::Server { std::string _username; 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, is_memcached_libtool(), 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, is_memcached_libtool(), is_socket_arg) { set_pid_file(); } @@ -82,69 +115,42 @@ 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 (pid_file().empty() == false) - { - 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= MEMCACHED_SUCCESS; - if (has_socket()) - { - if (socket().empty()) - { - return -1; - } + Wait wait(pid(), 4); - local_pid= libmemcached_util_getpid(socket().c_str(), port(), &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() { +#if 0 // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (pid_file().empty() == false) { if (wait_for_pidfile() == false) { - Error << "Pidfile was not found:" << pid_file(); + Error << "Pidfile was not found:" << pid_file() << " :" << running(); return -1; } } +#endif memcached_return_t rc; bool ret; if (has_socket()) { - ret= libmemcached_util_ping(socket().c_str(), 0, &rc); + ret= libmemcached_util_ping(socket().c_str(), 0, &rc); } else { ret= libmemcached_util_ping(hostname().c_str(), port(), &rc); } - if (memcached_failed(rc) or not ret) + if (memcached_failed(rc) or ret == false) { - Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc); + error(memcached_strerror(NULL, rc)); } return ret; @@ -160,6 +166,11 @@ public: return MEMCACHED_BINARY; } + bool is_libtool() + { + return is_memcached_libtool(); + } + virtual void pid_file_option(Application& app, const std::string& arg) { if (arg.empty() == false) @@ -173,11 +184,6 @@ public: return "-s "; } - const char *daemon_file_option() - { - return "-d"; - } - virtual void port_option(Application& app, in_port_t arg) { char buffer[30]; @@ -203,11 +209,6 @@ public: } } - bool is_libtool() - { - return false; - } - bool broken_socket_cleanup() { return true; @@ -226,43 +227,12 @@ class MemcachedLight : public libtest::Server { public: - MemcachedLight(const std::string& host_arg, const in_port_t port_arg): - libtest::Server(host_arg, port_arg) + MemcachedLight(const std::string& host_arg, const in_port_t port_arg) : + libtest::Server(host_arg, port_arg, MEMCACHED_LIGHT_BINARY, true) { set_pid_file(); } - 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; - } - } - - bool success= false; - std::stringstream error_message; - pid_t local_pid= get_pid_from_file(pid_file(), error_message); - if (local_pid > 0) - { - if (::kill(local_pid, 0) > 0) - { - success= true; - } - } - - if (error_is_ok and ((success or not is_pid_valid(local_pid)))) - { - Error << "kill(" << " pid: " << local_pid << " errno:" << strerror(errno) << " for:" << *this; - } - - return local_pid; - } - bool ping() { // Memcached is slow to start, so we need to do this @@ -298,11 +268,6 @@ public: return MEMCACHED_LIGHT_BINARY; } - const char *daemon_file_option() - { - return "--daemon"; - } - virtual void port_option(Application& app, in_port_t arg) { char buffer[1024]; @@ -342,7 +307,11 @@ public: 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) : + 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) { } @@ -361,49 +330,8 @@ public: 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; @@ -416,9 +344,9 @@ public: ret= libmemcached_util_ping2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc); } - if (memcached_failed(rc) or not ret) + if (memcached_failed(rc) or ret == false) { - Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc); + error(memcached_strerror(NULL, rc)); } return ret; @@ -431,16 +359,16 @@ public: bool Memcached::build(size_t argc, const char *argv[]) { - std::stringstream arg_buffer; - if (getuid() == 0 or geteuid() == 0) { add_option("-u", "root"); } add_option("-l", "localhost"); +#ifndef TARGET_OS_OSX add_option("-m", "128"); add_option("-M"); +#endif if (sasl()) { @@ -457,7 +385,7 @@ bool Memcached::build(size_t argc, const char *argv[]) bool MemcachedLight::build(size_t argc, const char *argv[]) { - for (int x= 0 ; x < argc ; x++) + for (size_t x= 0 ; x < argc ; x++) { add_option(argv[x]); }