Skip to content

Handle box read-only state changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edam wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Handle box read-only state changes #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb1e56c
added pause/unpause and watchdog for box ro/rw state
edam Jul 20, 2020
30a951b
removed duplicate space name from logs
edam Jul 20, 2020
9d416d5
name watchdog fiber
edam Aug 11, 2020
7ef680d
check if stopped running prior to delete
edam Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions indexpiration.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,44 @@ end

local F = {}

function F:stop()
self.stopped = true
function F:terminate()
self._terminate = true
self:stop_worker()
end

function F:start_watchdog()
self._watcher = fiber.create(function(expiration)
fiber.name('indexpiration-watchdog')
while not expiration._terminate do
if box.info.ro then
expiration:stop_worker()
pcall(box.ctl.wait_rw)
else
expiration:start_worker()
pcall(box.ctl.wait_ro)
end
end
end, self)
end

function F:stop_worker()
if not self.running then return end
self.running = false
self._wait:put(true,0)
end

function F:start_worker()
if self._terminate or self.running then return end
self.running = true
self._worker = fiber.create(function(space,expiration,expire_index)
local fname = space.name .. '.xpr'
if package.reload then fname = fname .. '.' .. package.reload.count end
fiber.name(string.sub(fname,1,32))
repeat fiber.sleep(0.001) until space.expiration
local chan = expiration._wait
log.info("Worker started")
local curwait
local collect = {}
while box.space[space.name] and space.expiration == expiration and not expiration.stopped do
while box.space[space.name] and space.expiration == expiration and expiration.running do
local r,e = pcall(function()
-- print("runat loop 2 ",box.time64())
local remaining
Expand Down Expand Up @@ -103,6 +125,10 @@ function F:start_worker()
end
for _,t in pairs(collect) do
if not expiration.txn then
if not expiration.running then
remaining = 0
break
end
t = box.space[space.name]:get(expiration._pk(t))
if expiration.check( t ) > 0 then
t = nil
Expand Down Expand Up @@ -139,12 +165,12 @@ function F:start_worker()
end
-- log.info("Wait %0.2fs",curwait)
if curwait == 0 then fiber.sleep(0) end
chan:get(curwait)
expiration._wait:get(curwait)
end
if expiration.stopped then
log.info("Expiration worker was stopped")
else
if expiration.running then
log.info("Worker finished")
else
log.info("Worker stopped")
end
end,box.space[self.space],self,self.expire_index)
end
Expand Down Expand Up @@ -257,8 +283,9 @@ function M.upgrade(space,opts,depth)
self.space = space.id
self.expire_index = expire_index

self:start_worker()

self._terminate = false
self.running = false
self:start_watchdog()

if self.precise then
self._on_repl = space:on_replace(function(old, new)
Expand Down