Fix memtier: add a TAP-wrapper, bump memtier version, add to CI

.github/workflows/testing.yaml

@@ -42,4 +42,8 @@ jobs:
         run: pip install -r test-run/requirements.txt
 
       - run: make test-memcached
+
       - run: make test-memcached-capable
+
+      - name: Run benchmarks
+        run: make test-memcached-bench

README.md

@@ -1,6 +1,7 @@
 <a href="http://tarantool.org">
   <img src="https://avatars2.githubusercontent.com/u/2344919?v=2&s=250" align="right">
 </a>
+
 [![Static analysis](https://github.com/tarantool/memcached/actions/workflows/check.yaml/badge.svg)](https://github.com/tarantool/memcached/actions/workflows/check.yaml)
 [![Testing](https://github.com/tarantool/memcached/actions/workflows/testing.yaml/badge.svg)](https://github.com/tarantool/memcached/actions/workflows/testing.yaml)
 

memcached/internal/proto_bin.c

@@ -1015,7 +1015,7 @@ memcached_bin_process(struct memcached_connection *con)
 
 /**
  * return -1 on error (forced closing of connection)
- * return  0 in everything ok
+ * return  0 if everything ok
  * - if con->noprocess == 1 then skip execution
  * return >1 if we need more data
  */

test/CMakeLists.txt

@@ -5,3 +5,7 @@ add_dependencies(test-memcached internalso)
 add_custom_target(test-memcached-capable
         COMMAND ${CMAKE_SOURCE_DIR}/test/test-run.py --suite capable)
 add_dependencies(test-memcached-capable libmemcached)
+
+add_custom_target(test-memcached-bench
+        COMMAND ${CMAKE_SOURCE_DIR}/test/test-run.py --force --long --suite bench)
+add_dependencies(test-memcached-bench internalso memtier)

test/bench/bench.lua

@@ -0,0 +1,10 @@
+#!/usr/bin/env tarantool
+
+box.cfg{
+    wal_mode = 'none',
+    memtx_memory = 100 * 1024 * 1024,
+}
+
+require('console').listen(os.getenv('ADMIN'))
+
+box.schema.user.grant('guest', 'read,write,execute', 'universe')

test/bench/memtier.test.lua

@@ -0,0 +1,68 @@
+#!/usr/bin/env tarantool
+
+local tap = require('tap')
+local fio = require('fio')
+local has_popen, popen = pcall(require, 'popen')
+package.cpath = './?.so;' .. package.cpath
+local memcached = require('memcached')
+local test = tap.test('memcached benchmarks')
+
+if not has_popen then
+    test:plan(0)
+    os.exit(0)
+end
+
+test:plan(3)
+
+local is_test_run = os.getenv('LISTEN')
+
+if type(box.cfg) == 'function' then
+    box.cfg{
+        wal_mode = 'none',
+        memtx_memory = 100 * 1024 * 1024,
+    }
+    box.schema.user.grant('guest', 'read,write,execute', 'universe')
+end
+
+local port = 11211
+local mc = memcached.create('memcached', tostring(port), {})
+
+local function run_memtier(instance, memtier_path, proto)
+    instance:cfg({
+        protocol = proto,
+    })
+    local memtier_proto = 'memcache_' .. proto
+    local memtier_argv = {
+        memtier_path,
+        '--server=127.0.0.1',
+        string.format('--port=%d', port),
+        string.format('--protocol=%s', memtier_proto),
+        '--threads=10',
+        '--test-time=2',
+        '--hide-histogram'
+    }
+
+    local stdout = is_test_run and popen.opts.PIPE or popen.opts.INHERIT
+    local stderr = is_test_run and popen.opts.PIPE or popen.opts.INHERIT
+    local ph = popen.new(memtier_argv, {
+        stdout = stdout,
+        stderr = stderr,
+    })
+    local res = ph:wait()
+    ph:close()
+
+    return res.exit_code
+end
+
+-- path to memtier_benchmark in case of tarantool that run in project root dir
+local memtier_path = 'test/bench/memtier_benchmark'
+if not fio.path.exists(memtier_path) then
+    -- path to memtier_benchmark in case of test-run
+    memtier_path = './memtier_benchmark'
+end
+
+test:is(fio.path.exists(memtier_path), true, 'memtier_benchmark binary is available')
+test:is(run_memtier(mc, memtier_path, 'text'), 0, 'memtier with text protocol')
+test:is(run_memtier(mc, memtier_path, 'binary'), 0, 'memtier with binary protocol')
+
+os.exit(0)

test/bench/suite.ini

@@ -0,0 +1,7 @@
+[default]
+core = app
+description = memcached load tests with #! using TAP
+script = bench.lua
+is_parallel = False
+long_run = memtier.test.lua
+lua_libs = memtier_benchmark

test/binary/binary.lua

@@ -2,7 +2,7 @@
 
 box.cfg{
     wal_mode = 'none',
-    slab_alloc_arena = 0.1,
+    memtx_memory = 100 * 1024 * 1024,
 }
 
 package.cpath = './?.so;' .. package.cpath

test/capable/capable.lua

@@ -2,7 +2,7 @@
 
 box.cfg{
     wal_mode         = 'none',
-    slab_alloc_arena = 0.1,
+    memtx_memory = 100 * 1024 * 1024,
 }
 
 package.cpath = './?.so;' .. package.cpath

test/sasl/sasl.lua

@@ -66,7 +66,7 @@ env['SASL_CONF_PATH'] = fio.pathjoin(fio.cwd(), '../sasl/config/')
 
 box.cfg{
     wal_mode = 'none',
-    slab_alloc_arena = 0.1,
+    memtx_memory = 100 * 1024 * 1024,
 }
 
 local memcached = require('memcached')

test/text/text.lua

@@ -2,7 +2,7 @@
 
 box.cfg{
     wal_mode = 'none',
-    slab_alloc_arena = 0.1,
+    memtx_memory = 100 * 1024 * 1024,
 }
 
 package.cpath = './?.so;' .. package.cpath