Skip to content

Commit aa00d9e

Browse files
CP-54217: Change wording
Signed-off-by: Stephen Cheng <[email protected]>
1 parent 95fe296 commit aa00d9e

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

ocaml/idl/datamodel_lifecycle.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ let prototyped_of_field = function
138138
| "VM", "actions__after_softreboot" ->
139139
Some "23.1.0"
140140
| "pool", "limit_console_sessions" ->
141-
Some "25.29.0"
141+
Some "25.30.0-next"
142142
| "pool", "ha_reboot_vm_on_internal_shutdown" ->
143143
Some "25.16.0"
144144
| "pool", "license_server" ->

ocaml/idl/datamodel_pool.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,8 +2252,9 @@ let t =
22522252
when HA is enabled"
22532253
; field ~writer_roles:_R_POOL_OP ~qualifier:RW ~lifecycle:[] ~ty:Bool
22542254
~default_value:(Some (VBool false)) "limit_console_sessions"
2255-
"Indicate whether the console concurrent limit is set for the pool \
2256-
(false means no limit)"
2255+
"When true, only one console connection per VM/host in the pool is \
2256+
accepted. Otherwise every connection for a VM/host's console is \
2257+
accepted"
22572258
]
22582259
)
22592260
()

ocaml/idl/schematest.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
33
(* BEWARE: if this changes, check that schema has been bumped accordingly in
44
ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
55

6-
let last_known_schema_hash = "f546a0d01815608cbcf04cdb90c1be9f"
6+
let last_known_schema_hash = "d1625c58de3d8f037af81609a6e0f165"
77

88
let current_schema_hash : string =
99
let open Datamodel_types in

ocaml/xapi-cli-server/records.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ let pool_record rpc session_id pool =
15991599
~get:(fun () -> string_of_bool (x ()).API.pool_limit_console_sessions)
16001600
~set:(fun x ->
16011601
Client.Pool.set_limit_console_sessions ~rpc ~session_id ~self:pool
1602-
~value:(bool_of_string x)
1602+
~value:(safe_bool_of_string "limit-console-sessions" x)
16031603
)
16041604
()
16051605
]

ocaml/xapi/console.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ type address =
3434

3535
(* console is listening on a Unix domain socket *)
3636

37-
(* This module enforces connection limits for VM consoles.
38-
Depending on configuration, only one active connection per VM (including Dom0) is allowed,
39-
or that connections are unlimited. *)
37+
(* This module limits VNC console sessions to at most one per VM/host.
38+
Depending on configuration, either unlimited connections are allowed,
39+
or only a single active connection per VM/host is allowed. *)
4040
module Connection_limit = struct
4141
module VMSet = Set.Make (String)
4242

0 commit comments

Comments
 (0)