Skip to content

xapi: Fix pool.join breaking due to dangling ref #7365

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

Open
last-genius wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xapi: Fix pool.join breaking due to dangling ref #7365

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
22 changes: 12 additions & 10 deletions ocaml/xapi/xapi_pool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,16 +1093,18 @@ let rec create_or_get_host_on_master __context rpc session_id (host_ref, host) :
Db.Host.get_local_cache_sr ~__context ~self:host_ref
in
let local_cache_sr =
if my_local_cache_sr = Ref.null then
Ref.null
else
let my_local_cache_sr_rec =
Db.SR.get_record ~__context ~self:my_local_cache_sr
in
debug "Copying the local cache SR (uuid=%s)"
my_local_cache_sr_rec.API.sR_uuid ;
create_or_get_sr_on_master __context rpc session_id
(my_local_cache_sr, my_local_cache_sr_rec)
try
if my_local_cache_sr = Ref.null then
Ref.null
else
let my_local_cache_sr_rec =
Db.SR.get_record ~__context ~self:my_local_cache_sr
in
debug "Copying the local cache SR (uuid=%s)"
my_local_cache_sr_rec.API.sR_uuid ;
create_or_get_sr_on_master __context rpc session_id
(my_local_cache_sr, my_local_cache_sr_rec)
with _ -> Ref.null
in

debug "Creating host object on master" ;
Expand Down
Loading