Skip to content

CA-413598/XSI-1954: Only block pool join for clustering on non-management VLAN #6585

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

Merged
merged 1 commit into from
Jul 10, 2025
Merged

CA-413598/XSI-1954: Only block pool join for clustering on non-management VLAN #6585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions ocaml/xapi/xapi_pool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,23 @@ let pre_join_checks ~__context ~rpc ~session_id ~force =
| pif when pif = Ref.null ->
()
| pif -> (
match Client.PIF.get_VLAN ~rpc ~session_id ~self:pif with
| vlan when vlan > 0L ->
error "Cannot join pool whose clustering is enabled on VLAN network" ;
match
( Client.PIF.get_VLAN ~rpc ~session_id ~self:pif
, Client.PIF.get_management ~rpc ~session_id ~self:pif
)
with
| vlan, false when vlan > 0L ->
error
"Cannot join pool whose clustering is enabled on a \
non-management VLAN network" ;
raise
(Api_errors.Server_error
( Api_errors
.pool_joining_pool_cannot_enable_clustering_on_vlan_network
, [Int64.to_string vlan]
)
)
| 0L | _ -> (
| _ -> (
let clustering_bridges_in_pool =
( match
Client.PIF.get_bond_master_of ~rpc ~session_id ~self:pif
Expand Down
Loading