CA-NNNNN: avoid calling DB functions when in emergency mode

edwintorok · edwintorok · commit 898bbb95419e · 2025-02-07T15:19:27.000Z
This breaks emergency mode commands.

Signed-off-by: Edwin Török &lt;edwin.torok@cloud.com&gt;
diff --git a/ocaml/xapi/server_helpers.ml b/ocaml/xapi/server_helpers.ml
@@ -150,7 +150,7 @@ let do_dispatch ?session_id ?forward_op ?self:_ supports_async called_fn_name
             in
             Tgroup.Group.Identity.make ?user_agent:http_req.user_agent subject
           )
-          session_id
+          (if !Xapi_globs.tgroups_enabled && not !Xapi_globs.slave_emergency_mode then session_id else None)
       with _ -> None
     in
     Tgroup.of_creator (Tgroup.Group.Creator.make ?identity ()) ;

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ let do_dispatch ?session_id ?forward_op ?self:_ supports_async called_fn_name`
`150`	`150`	`in`
`151`	`151`	`Tgroup.Group.Identity.make ?user_agent:http_req.user_agent subject`
`152`	`152`	`)`
`153`		`- session_id`
	`153`	`+ (if !Xapi_globs.tgroups_enabled && not !Xapi_globs.slave_emergency_mode then session_id else None)`
`154`	`154`	`with _ -> None`
`155`	`155`	`in`
`156`	`156`	`Tgroup.of_creator (Tgroup.Group.Creator.make ?identity ()) ;`