Skip to content

Commit 405bcb5

Browse files
committed
CA-405971: avoid calling DB functions when in emergency mode
This breaks emergency mode commands. Signed-off-by: Edwin Török <[email protected]>
1 parent 391c8f4 commit 405bcb5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

ocaml/xapi/server_helpers.ml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,14 @@ let do_dispatch ?session_id ?forward_op ?self:_ supports_async called_fn_name
152152
Tgroup.Group.Identity.make ?user_agent:http_req.user_agent
153153
subject
154154
)
155-
session_id
155+
( if !Xapi_globs.slave_emergency_mode then
156+
(* in emergency mode we cannot reach the coordinator,
157+
and we must not attempt to make Db calls
158+
*)
159+
None
160+
else
161+
session_id
162+
)
156163
with _ -> None
157164
in
158165
Tgroup.of_creator (Tgroup.Group.Creator.make ?identity ())

0 commit comments

Comments
 (0)