X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Flib%2FMemcachedCluster.cpp;h=06e2c7f1b97d3cfac6f49366d723b4fa12a05d6a;hb=fe7194f7d6348559fc9219d9899c9633c9de77f2;hp=573dddf384edd850b9c07723b4fa857b3ca5a84a;hpb=e9b1c46e3490e2940ec36cfa53ffcee5945a27d2;p=awesomized%2Flibmemcached diff --git a/test/lib/MemcachedCluster.cpp b/test/lib/MemcachedCluster.cpp index 573dddf3..06e2c7f1 100644 --- a/test/lib/MemcachedCluster.cpp +++ b/test/lib/MemcachedCluster.cpp @@ -29,6 +29,11 @@ void MemcachedCluster::init() { } REQUIRE(memcached_create(&memc)); + + for (const auto &[behavior, value] : to_set) { + REQUIRE(MEMCACHED_SUCCESS == memcached_behavior_set(&memc, behavior, value)); + } + for (const auto &server : cluster.getServers()) { auto target = server.getSocketOrPort(); if (holds_alternative(target)) { @@ -59,8 +64,9 @@ MemcachedCluster::MemcachedCluster() init(); } -MemcachedCluster::MemcachedCluster(Cluster &&cluster_) +MemcachedCluster::MemcachedCluster(Cluster &&cluster_, behaviors_t to_set_) : cluster{move(cluster_)} +, to_set{move(to_set_)} { init(); } @@ -103,7 +109,9 @@ MemcachedCluster MemcachedCluster::udp() { Server::arg_pair_t{"-U", random_socket_or_port_string}, Server::arg_t{"-v"} } - }}}; + }}, { + {MEMCACHED_BEHAVIOR_USE_UDP, 1} + }}; } #if LIBMEMCACHED_WITH_SASL_SUPPORT @@ -114,8 +122,9 @@ MemcachedCluster MemcachedCluster::sasl() { Server::arg_pair_t{"-p", random_socket_or_port_string}, Server::arg_t{"-S"} } - }}}; - mc.enableBinaryProto(); + }}, { + {MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1}, + }}; REQUIRE(MEMCACHED_SUCCESS == memcached_set_sasl_auth_data(&mc.memc, "memcached", "memcached")); return mc; @@ -134,10 +143,11 @@ void MemcachedCluster::enableBuffering(bool enable) { void MemcachedCluster::enableReplication() { REQUIRE(MEMCACHED_SUCCESS == memcached_behavior_set(&memc, - MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, memcached_server_count(&memc))); + MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, memcached_server_count(&memc) - 1)); } -void MemcachedCluster::enableUdp(bool enable) { - REQUIRE(MEMCACHED_SUCCESS == memcached_behavior_set(&memc, - MEMCACHED_BEHAVIOR_USE_UDP, enable)); +void MemcachedCluster::killOneServer() { + const auto &servers = cluster.getServers(); + const auto &victim = servers[random_num(0UL, servers.size() - 1)]; + ::kill(victim.getPid(), SIGKILL); }