Skip to content

Commit eefef58

Browse files
committed
TNTP-2109: Add checks for safe mode trigger and stored value
1 parent 1fa88c7 commit eefef58

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

crud/common/rebalance.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ end
5858
local function safe_mode_enable()
5959
if not box.info.ro then
6060
box.space[SETTINGS_SPACE_NAME]:replace{ 'safe_mode', true }
61-
box.space._bucket:on_replace(nil, safe_mode_trigger)
61+
for _, trig in pairs(box.space._bucket:on_replace()) do
62+
if trig == safe_mode_trigger then
63+
box.space._bucket:on_replace(nil, safe_mode_trigger)
64+
end
65+
end
6266
end
6367
M.safe_mode = true
6468

@@ -92,7 +96,7 @@ local function rebalance_init()
9296
else
9397
stored_safe_mode = box.space[SETTINGS_SPACE_NAME]:get{ 'safe_mode' }
9498
end
95-
M.safe_mode = stored_safe_mode.value
99+
M.safe_mode = stored_safe_mode and stored_safe_mode.value or false
96100

97101
if M.safe_mode then
98102
for hook, _ in pairs(M.safe_mode_enable_hooks) do

0 commit comments

Comments
 (0)