Skip to content

Commit

Permalink
fix tests in ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ochaton committed Sep 12, 2024
1 parent a8fae9f commit 4e972d2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test-%: config-test-%
docker run --name $(<) \
--net tt_net \
-e TT_ETCD_ENDPOINTS="http://etcd0:2379,http://etcd1:2379,http://etcd2:2379" \
--rm -v $$(pwd):/source/config \
-v $$(pwd):/source/config \
-v $$(pwd)/data:/tmp/ \
--workdir /source/config \
--entrypoint '' \
Expand Down
6 changes: 1 addition & 5 deletions config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -992,11 +992,7 @@ local M
-- Moreover, first run of box.cfg in the life of the process allows to specify static box.cfg options, such as pid_file, log
-- and many others.
-- But, second reconfiguration of box.cfg (due to reload, or reconfiguration in fencing must never touch static options)
-- Part of this is fixed in `do_cfg` method of this codebase. But! Tarantool is buggy, so some options such as `log` appears to
-- be dynamic (it is listed in load_cfg.dynamic_cfg) but in practices log is static option.

-- do_cfg calls under the hood first_cfg or redo_cfg based on type of `box.cfg` (when function -- then it is first_cfg,
-- otherwise -- redo_cfg).
-- Part of this is fixed in `do_cfg` method of this codebase.

-- Because many wrappers in docker-entrypoint.lua and tarantoolctl LOVES to perform non-redoable actions inside box.cfg and
-- switch box.cfg back to builtin tarantool box.cfg, following code MUST NEVER cache value of box.cfg
Expand Down
2 changes: 0 additions & 2 deletions test/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

x-env: &env
ETCDCTL_API: 2
ETCD_ENABLE_V2: true
Expand Down

0 comments on commit 4e972d2

Please sign in to comment.