Skip to content

Commit

Permalink
Mark expelled instances as left
Browse files Browse the repository at this point in the history
  • Loading branch information
yngvar-antonsson committed Jan 13, 2025
1 parent 9d8790d commit 021dd47
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Changed

- Update ``membership`` dependency to `2.4.6 <https://github.com/tarantool/membership/releases/tag/2.4.6>`_.

- Expelled instances are now marked as ``left`` in ``membership``.

-------------------------------------------------------------------------------
[2.13.0] - 2024-11-28
-------------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion cartridge/confapplier.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ local yaml = require('yaml').new()
local fiber = require('fiber')
local errors = require('errors')
local checks = require('checks')
local membership = require('membership')
local uri_tools = require('uri')
local socket = require('socket')
local json = require('json')
local membership = require('membership')

local vars = require('cartridge.vars').new('cartridge.confapplier')
local pool = require('cartridge.pool')
Expand Down Expand Up @@ -292,6 +292,7 @@ local function apply_config(clusterwide_config)
if failover.is_leader() then
for _, uuid, _ in fun.filter(topology.expelled, topology_cfg.servers) do
box.space._cluster.index.uuid:delete(uuid)
membership.mark_left(topology_cfg.servers[uuid].uri)
end
end

Expand Down

0 comments on commit 021dd47

Please sign in to comment.