Skip to content

Commit 91046d0

Browse files
committed
Enable MVCC engine using command-line option
Tarantool 2.6 includes MVCC support [1]. When option `--mvcc` is specified in a command-line options option `memtx_use_mvcc_engine = true` passed to `box.cfg` on Tarantool initialization. 1. tarantool/tarantool#4897 Closes #41
1 parent 3ccaeeb commit 91046d0

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

resources/tarantool/jepsen.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ box.cfg {
88
too_long_threshold = 0.5;
99
custom_proc_title = 'jepsen';
1010
memtx_memory = 1024*1024*1024;
11+
memtx_use_mvcc_engine = %TARANTOOL_MVCC%;
1112
}
1213
else
1314
box.cfg {
@@ -20,7 +21,8 @@ box.cfg {
2021
log_nonblock = false;
2122
too_long_threshold = 0.5;
2223
custom_proc_title = 'jepsen';
23-
memtx_memory = 1024*1024*1024,
24+
memtx_memory = 1024*1024*1024;
25+
memtx_use_mvcc_engine = %TARANTOOL_MVCC%;
2426
}
2527
end
2628

src/tarantool/db.clj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
(c/exec :echo (-> "tarantool/jepsen.lua" io/resource slurp
215215
(str/replace #"%TARANTOOL_REPLICATION%" (replica-set test))
216216
(str/replace #"%TARANTOOL_IS_READ_ONLY%" (boolean-to-str read-only))
217+
(str/replace #"%TARANTOOL_MVCC%" (boolean-to-str (:mvcc test)))
217218
(str/replace #"%TARANTOOL_SINGLE_MODE%" (boolean-to-str (is-single-mode? test)))
218219
(str/replace #"%TARANTOOL_DATA_ENGINE%" (:engine test)))
219220
:> "/etc/tarantool/instances.enabled/jepsen.lua")

src/tarantool/runner.clj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
[["-v" "--version VERSION"
7070
"What Tarantool version should we test?"
7171
:default "2.6"]
72+
[nil "--mvcc"
73+
"Enable MVCC engine"
74+
:default false]
7275
["-w" "--workload NAME" "Test workload to run"
7376
:parse-fn keyword
7477
:missing (str "--workload " (cli/one-of workloads))
@@ -131,6 +134,7 @@
131134
:os ubuntu/os
132135
:db (db/db (:version opts))
133136
:engine (:engine opts)
137+
:mvcc (:mvcc opts)
134138
:pure-generators true
135139
:generator gen
136140
:checker (checker/compose {:perf (checker/perf)

0 commit comments

Comments
 (0)