Merge pull request #1267 from mcclurmc/minion-ca-87689

Clean up the snapshot VDI if SXM fails
CP-4148:Change the default behaviour for emulated monitor to "null"

Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Merge pull request #1269 from johnelse/cp-4148-clearwater

CP-4148:Change the default behaviour for emulated monitor to "null"
CA-106868: Datasource-list latency units are microseconds, not milliseconds
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Merge pull request #1271 from akshayramani/CA-106868-cw

CLEARWATER: CA-106868: Datasource-list latency units are microseconds, not milliseco...
[WHITESPACE] Periodic scheduler loop

$ git diff -w 3ddb861e63d4ffaa9ac0818f11fb027e3204208c^..3ddb861e63d4ffaa9ac0818f11fb027e3204208c
CA-107115: Xapi_period_scheduler: fall back to Thread.delay if Delay.wait fails

This ensures that the periodic scheduler does not spin and fill up the logs when
Delay.wait fails for some reason. A reason for failing is due to xapi hitting its
limit of open file descriptors.

If Delay.wait fails, we fall back to Thread.delay, which is less likely to fail.
If even this fails, we break out of the scheduler loop, logging an alarming error
message.

The difference between Delay.wait and Thread.delay is that Delay.wait can be
interrupted by a signal, and Thread.delay cannot. Such a signal is used when adding
a new item to the scheduler queue that expires before the current one.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
CA-107700 - Default to turning USB emulation on in xenopsd

xapi already defaults to turning this on, but during rolling-pool
upgrade the platform data gets passed directly from the sending to the
receiving xenopsd without xapi adding its usual defaults.

Therefore xenopsd also needs to default to turning this on, to match
previous releases.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1273 from robhoes/ca107115-cw

CLEARWATER: CA-107115: Xapi_period_scheduler: fall back to Thread.delay if Delay.wait fails
Merge pull request #1276 from johnelse/ca-107700-clearwater

CLEARWATER: CA-107700 - Default to turning USB emulation on in xenopsd
CA-105004: Enable SO_KEEPALIVE for stunnel server

We should also consider fine tweaking KEEPALIVE parameters when we upgrade to the new version of stunnel.

Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>
CA-107247: HVM guests don't require the latest PV drivers for vbd-plug
and vif-plug.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
CA-102761: To check if RPU is actually in progress before enabling HA
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
Create a function to check for different host platform versions and to
use it before enabling HA.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
Moving platform_versions to just before debug statement.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
Whitespace: import.ml

$ camlp4o -printer o -no_comments ocaml/xapi/import.ml | md5sum
6f9ba28e993217e23116ad7850077527  -
$ git checkout HEAD^
$ camlp4o -printer o -no_comments ocaml/xapi/import.ml | md5sum
6f9ba28e993217e23116ad7850077527  -

Signed-off-by: John Else <john.else@citrix.com>
Add a helper function to import.ml

Signed-off-by: John Else <john.else@citrix.com>
CA-105974: Preserve genid for template import and cross-pool migration

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1281 from johnelse/ca-105974-clearwater

CLEARWATER: CA-105974: Preserve genid for template import and cross-pool migration
Merge pull request #1278 from siddharthv/CA-107247-CW

CA-107247: HVM guests don't require the latest PV drivers for vbd-plug and vif-plug.