Merge pull request xapi-project#1723 from djs55/from-xenserver-core-queues

Support multiple xenopsds, running at the same time

Author: djs55

OMakefile

@@ -151,11 +151,8 @@ JAVA_PHASE3_TARGETS = $(if $(COMPILE_JAVA), $(JAVA_PHASE3))
 # Phase 3 targets divided into two depending on whether we're building the Xen stuff or not:
 OCAML_PHASE3_XEN = \
 	ocaml/xapi/xapi \
-	allxenops \
-	ocaml/xenops/cancel_utils_test \
 	ocaml/xapi/quicktestbin \
 	ocaml/xapi/storage_impl_test \
-	ocaml/xapi/cancel_tests \
 	ocaml/license/v6d
 
 #ocaml/xapi/monitor_fake_plugin
@@ -191,8 +188,6 @@ OCAML_PHASE3_NOXEN = \
 	ocaml/mpathalert/mpathalert \
 	ocaml/multipathrt/multipathrt
 
-# ocaml/xapi/rrddump
-
 OCAML_PHASE3 = $(OCAML_PHASE3_XEN) $(OCAML_PHASE3_NOXEN)
 
 OCAML_PHASE1_TARGETS = $(if $(COMPILE_OCAML), $(OCAML_PHASE1))

mk/Makefile

@@ -86,7 +86,6 @@ $(OUTPUT_CLI_RT) $(OUTPUT_SDK): $(MY_MAIN_PACKAGES)/.dirstamp $(RPM_DIRECTORIES)
 	cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-tests-*.rpm $(MY_MAIN_PACKAGES)
 	cp $(RPM_RPMSDIR)/*/xapi-www-*.rpm $(MY_MAIN_PACKAGES)
 	cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-xe-*.rpm $(MY_MAIN_PACKAGES)
-	cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-xenops-*.rpm $(MY_MAIN_PACKAGES)
 	mkdir -p $(MY_XCP_PACKAGES)
 	cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-v6d-*.rpm $(MY_XCP_PACKAGES)
 

ocaml/OMakefile

@@ -14,7 +14,6 @@ OCamlLibrary(fhs, fhs)
 	idl \
 	util \
 	xapi \
-	xenops \
 	xva \
 	console \
 	auth \
@@ -34,7 +33,6 @@ OCamlLibrary(fhs, fhs)
 	mpathalert \
 	multipathrt \
 	doc \
-	rrdd \
 	test
 
 clean:

ocaml/idl/ocaml_backend/taskHelper.ml

@@ -210,7 +210,7 @@ let failed ~__context (code, params) =
 
 type id = 
 	| Sm of string
-	| Xenops of string
+	| Xenops of string * string (* queue name * id *)
 
 let id_to_task_tbl : (id, API.ref_task) Hashtbl.t = Hashtbl.create 10
 let task_to_id_tbl : (API.ref_task, id) Hashtbl.t = Hashtbl.create 10
@@ -238,7 +238,7 @@ let register_task __context id =
 	(* Since we've bound the XenAPI Task to the xenopsd Task, and the xenopsd Task
 	   is cancellable, mark the XenAPI Task as cancellable too. *)
 	set_cancellable ~__context;
-	id
+	()
 
 let unregister_task __context id =
 	(* The rest of the XenAPI Task won't be cancellable *)
@@ -249,5 +249,5 @@ let unregister_task __context id =
 			Hashtbl.remove id_to_task_tbl id;
 			Hashtbl.remove task_to_id_tbl task;
 		);
-	id
+	()
 

ocaml/idl/ocaml_backend/taskHelper.mli

@@ -35,11 +35,13 @@ val init : unit -> unit
 val rbac_assert_permission_fn : (__context:Context.t -> permission:Db_actions.role_t -> unit) option ref
 val assert_can_destroy :  ?ok_if_no_session_in_context:bool -> __context:Context.t ->  [ `task ] Ref.t -> unit
 
-type id = Sm of string | Xenops of string
+type id =
+  | Sm of string
+  | Xenops of string * string (** queue name * VM id *)
 
 val id_to_task_exn : id -> API.ref_task
 val task_to_id_exn : API.ref_task -> id
-val register_task : Context.t -> id -> id
-val unregister_task : Context.t -> id -> id
+val register_task : Context.t -> id -> unit
+val unregister_task : Context.t -> id -> unit