X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=05f43975c2c9134a2f41f86ee92fedbcecaa2583;hb=e68b8f1c62d879453fc0272441e85afdb7715f09;hp=e3d90947a2c0e1b99a5395dbb94f0942d27122f4;hpb=c87f1a554cce74ac1ba3d4e7e9c2a1d2904e4766;p=m6w6%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index e3d90947..05f43975 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -4,36 +4,22 @@ * * Copyright (C) 2011 Data Differential, http://datadifferential.com/ * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * 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. * - * * 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. + * 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. * + * 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 @@ -63,43 +49,68 @@ using namespace libtest; using namespace libtest; -class Memcached : public Server +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) : - 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, 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) + { + set_pid_file(); + } + + virtual const char *sasl() const + { + return NULL; + } + + const std::string& password() const + { + return _password; + } + + const std::string& username() const + { + return _username; + } + pid_t get_pid(bool error_is_ok) { // Memcached is slow to start, so we need to do this if (not pid_file().empty()) { - Wait wait(pid_file(), 0); - - if (not wait.successful()) + if (error_is_ok and not wait_for_pidfile()) { Error << "Pidfile was not found:" << pid_file(); return -1; } } - memcached_return_t rc; + pid_t local_pid; + memcached_return_t rc= MEMCACHED_SUCCESS; if (has_socket()) { - _pid= libmemcached_util_getpid(socket().c_str(), port(), &rc); + local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc); } else { - _pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc); + local_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc); } - if ((memcached_failed(rc) or _pid < 1) and not error_is_ok) + if (error_is_ok and ((memcached_failed(rc) or not is_pid_valid(local_pid)))) { - Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << _pid << " for:" << *this; + Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << local_pid << " for:" << *this; } - return _pid; + return local_pid; } bool ping() @@ -107,9 +118,7 @@ public: // Memcached is slow to start, so we need to do this if (not pid_file().empty()) { - Wait wait(pid_file(), 0); - - if (not wait.successful()) + if (not wait_for_pidfile()) { Error << "Pidfile was not found:" << pid_file(); return -1; @@ -118,9 +127,10 @@ public: 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 { @@ -129,8 +139,9 @@ public: if (memcached_failed(rc) or not ret) { - Error << "libmemcached_util_ping(" << memcached_strerror(NULL, rc) << ")"; + Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc); } + return ret; } @@ -174,6 +185,11 @@ public: return false; } + bool broken_socket_cleanup() + { + return true; + } + // Memcached's pidfile is broken bool broken_pid_file() { @@ -183,6 +199,93 @@ public: 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; + } + +}; + #include @@ -195,6 +298,15 @@ bool Memcached::build(int argc, const char *argv[]) arg_buffer << " -u root "; } + arg_buffer << " -l localhost "; + arg_buffer << " -m 128 "; + arg_buffer << " -M "; + + if (sasl()) + { + arg_buffer << sasl(); + } + for (int x= 1 ; x < argc ; x++) { arg_buffer << " " << argv[x] << " "; @@ -207,14 +319,35 @@ bool Memcached::build(int argc, const char *argv[]) namespace libtest { -Server *build_memcached(const std::string& hostname, const in_port_t try_port) +libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port) { return new Memcached(hostname, try_port, false); } -Server *build_memcached_socket(const std::string& hostname, const in_port_t try_port) +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()) + { + return new MemcachedSaSL(hostname, try_port, false, "memcached", "memcached"); + } + + return new MemcachedSaSL(hostname, try_port, false, username, password); +} + +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) { - return new Memcached(hostname, try_port, true); + if (username.empty()) + { + return new MemcachedSaSL(socket_file, try_port, true, "memcached", "memcached"); + } + + return new MemcachedSaSL(socket_file, try_port, true, username, password); } }