# HG changeset patch # User David Scott <[email protected]> # Date 1261253979 0 # Node ID 156116b96b363d9d2227d2583dc58a46c2e0fd7f # Parent b05d8886707cbf985ea488a0995f2160bbe4a7d4 CA-36074: fix the udev SR
Unfortunately the changeset containing the updates to use the new fork/exec protocol accidentally included a change which is part of the experimental 'vhdd' project. The change would be harmless except for the fact that the udev SR is 'created' rather than 'introduced' by the firstboot script and the backend doesn't currently support probe. Comment out the offending code for now. Signed-off-by: David Scott <[email protected]> diff -r b05d8886707c -r 156116b96b36 ocaml/xapi/xapi_sr.ml --- a/ocaml/xapi/xapi_sr.ml Fri Dec 18 21:12:08 2009 +0000 +++ b/ocaml/xapi/xapi_sr.ml Sat Dec 19 20:19:39 2009 +0000 @@ -270,7 +270,8 @@ let _type = String.lowercase _type in if not(List.mem _type (Sm.supported_drivers ())) then raise (Api_errors.Server_error(Api_errors.sr_unknown_driver, [ _type ])); - + (* This breaks the udev SR which doesn't support sr_probe *) +(* let probe_result = probe ~__context ~host ~device_config ~_type ~sm_config in begin match Xml.parse_string probe_result with @@ -285,7 +286,7 @@ then raise (Api_errors.Server_error ("SR_BACKEND_FAILURE_107",["";"";probe_result])) | _ -> () end; - +*) let sr_uuid = Uuid.make_uuid() in let sr_uuid_str = Uuid.to_string sr_uuid in (* Create the SR in the database before creating on disk, so the backends can read the sm_config field. If an error happens here 1 file changed, 3 insertions(+), 2 deletions(-) ocaml/xapi/xapi_sr.ml | 5 +++--
# HG changeset patch # User David Scott <[email protected]> # Date 1261253979 0 # Node ID 156116b96b363d9d2227d2583dc58a46c2e0fd7f # Parent b05d8886707cbf985ea488a0995f2160bbe4a7d4 CA-36074: fix the udev SR Unfortunately the changeset containing the updates to use the new fork/exec protocol accidentally included a change which is part of the experimental 'vhdd' project. The change would be harmless except for the fact that the udev SR is 'created' rather than 'introduced' by the firstboot script and the backend doesn't currently support probe. Comment out the offending code for now. Signed-off-by: David Scott <[email protected]> diff -r b05d8886707c -r 156116b96b36 ocaml/xapi/xapi_sr.ml --- a/ocaml/xapi/xapi_sr.ml Fri Dec 18 21:12:08 2009 +0000 +++ b/ocaml/xapi/xapi_sr.ml Sat Dec 19 20:19:39 2009 +0000 @@ -270,7 +270,8 @@ let _type = String.lowercase _type in if not(List.mem _type (Sm.supported_drivers ())) then raise (Api_errors.Server_error(Api_errors.sr_unknown_driver, [ _type ])); - + (* This breaks the udev SR which doesn't support sr_probe *) +(* let probe_result = probe ~__context ~host ~device_config ~_type ~sm_config in begin match Xml.parse_string probe_result with @@ -285,7 +286,7 @@ then raise (Api_errors.Server_error ("SR_BACKEND_FAILURE_107",["";"";probe_result])) | _ -> () end; - +*) let sr_uuid = Uuid.make_uuid() in let sr_uuid_str = Uuid.to_string sr_uuid in (* Create the SR in the database before creating on disk, so the backends can read the sm_config field. If an error happens here
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
