Merge pull request #14 from robhoes/ea1254

Make ea1254 branch equal to master minus libnl patch plus IP watcher patch

Author: Jon Ludlam

lib/network_utils.ml

@@ -45,7 +45,7 @@ let call_script ?(log_successful_output=false) script args =
                 let pid = Forkhelpers.safe_close_and_exec ~env None (Some writeme) None [] script args in
 		Unix.close writeme;
 		(* assume output is never larger than a pipe buffer *)
-		Forkhelpers.waitpid pid;
+		let (_: (int * Unix.process_status)) = Forkhelpers.waitpid pid in
 		let output = String.make 16384 '\000' in
 		let n = Unix.read readme output 0 (String.length output) in
 		Unix.close readme;
@@ -190,7 +190,8 @@ info "Found at [ %s ]" (String.concat ", " (List.map string_of_int indices));
 		ignore (call ~log:true ("link" :: "set" :: dev :: args))
 
 	let link_set_mtu dev mtu =
-		ignore (link_set dev ["mtu"; string_of_int mtu])
+		try ignore (link_set dev ["mtu"; string_of_int mtu])
+		with e -> error "MTU size is not supported: %s" (string_of_int mtu)
 
 	let link_set_up dev =
 		ignore (link_set dev ["up"])
@@ -199,21 +200,26 @@ info "Found at [ %s ]" (String.concat ", " (List.map string_of_int indices));
 		if is_up dev then
 			ignore (link_set dev ["down"])
 
+	let link ?(version=V46) dev attr =
+		let v = string_of_version version in
+		let output = call (v @ ["link"; "show"; "dev"; dev]) in
+		find output attr
+
 	let addr ?(version=V46) dev attr =
 		let v = string_of_version version in
 		let output = call (v @ ["addr"; "show"; "dev"; dev]) in
 		find output attr
 
 	let get_mtu dev =
-		int_of_string (List.hd (addr dev "mtu"))
+		int_of_string (List.hd (link dev "mtu"))
 
 	let get_state dev =
 		match addr dev "state" with
 		| "UP" :: _ -> true
 		| _ -> false
 
 	let get_mac dev =
-		List.hd (addr dev "link/ether")
+		List.hd (link dev "link/ether")
 
 	let set_mac dev mac =
 		try

lib/xcp-networkd.mllib

@@ -171,31 +171,21 @@ let rec monitor dbg () =
 				let vendor_id, device_id = if List.length devs = 1 then Sysfs.get_pci_ids dev else "", "" in
 				let carriers = List.map Sysfs.get_carrier devs in
 				let speed, duplex =
-					let int_of_duplex = function
-						| Duplex_half -> 1
-						| Duplex_full -> 2
-						| Duplex_unknown -> 0
+					let combine_duplex = function
+						| Duplex_full, Duplex_full -> Duplex_full
+						| Duplex_unknown, a | a, Duplex_unknown -> a
+						| _ -> Duplex_half
 					in
-					let duplex_of_int = function
-						| 1 -> Duplex_half
-						| 2 -> Duplex_full
-						| _ -> Duplex_unknown
-					in
-					let statuses = List.map2 (fun dev carrier ->
-						let speed, duplex =
-							try
-								if not carrier then failwith "no carrier";
-								Bindings.get_status dev
-							with _ ->
-								0,
-								Duplex_unknown
-						in
-						speed, int_of_duplex duplex
-					) devs carriers in
-					let speed, duplex =
-						List.fold_left (fun (speed, duplex) (speed', duplex') -> (speed + speed'), (min duplex duplex')) (0, 2) statuses
-					in
-					speed, duplex_of_int duplex
+					List.fold_left2 (fun (speed, duplex) dev carrier ->
+						try
+							if not carrier then
+								speed, duplex
+							else
+								let speed', duplex' = Bindings.get_status dev in
+								speed + speed', combine_duplex (duplex, duplex')
+						with _ ->
+							speed, duplex
+					) (0, Duplex_unknown) devs carriers
 				in
 				let nb_links = List.length devs in
 				let carrier = List.mem true carriers in
@@ -247,6 +237,19 @@ let signal_networking_change () =
 		(fun () -> XenAPI.Host.signal_networking_change xapi_rpc session)
 		(fun () -> XenAPI.Session.local_logout xapi_rpc session)
 
+(* Remove all outstanding reads on a file descriptor *)
+let clear_input fd =
+	let buf = String.make 255 ' ' in
+	let rec loop () =
+		try
+			ignore (Unix.read fd buf 0 255);
+			loop ()
+		with _ -> ()
+	in
+	Unix.set_nonblock fd;
+	loop ();
+	Unix.clear_nonblock fd
+
 let ip_watcher () =
 	let cmd = Network_utils.iproute2 in
 	let args = ["monitor"; "address"] in
@@ -256,16 +259,25 @@ let ip_watcher () =
 	);
 	Unix.close writeme;
 	let in_channel = Unix.in_channel_of_descr readme in
-	debug "Started IP watcher thread";
 	let rec loop () =
 		let line = input_line in_channel in
-		(* Do not send events for link-local IPv6 addresses *)
+		(* Do not send events for link-local IPv6 addresses, and removed IPs *)
 		if String.has_substr line "inet" && not (String.has_substr line "inet6 fe80") then begin
+			(* Ignore changes for the next second, since they usually come in bursts,
+			 * and signal only once. *)
+			Thread.delay 1.;
+			clear_input readme;
 			signal_networking_change ()
 		end;
 		loop ()
 	in
-	loop ()
+	while true do
+		try
+			info "(Re)started IP watcher thread";
+			loop ()
+		with e ->
+			warn "Error in IP watcher: %s\n%s" (Printexc.to_string e) (Printexc.get_backtrace ())
+	done
 
 let start () =
 	let dbg = "monitor_thread" in

networkd/libxcp-networkd_stubs.clib

@@ -36,7 +36,7 @@ start() {
 	# Enable backtraces
 	export OCAMLRUNPARAM="b"
 
-	${NETWORKD} -daemon -pidfile ${PID_FILE} >/dev/null 2>&1 </dev/null
+	${NETWORKD} -daemon true -pidfile ${PID_FILE} >/dev/null 2>&1 </dev/null
 
 	MAX_RETRIES=100
 	RETRY=0