Merge pull request xapi-project#1720 from jonludlam/CA-134593

CA-134593: The recent introduction of the configure script missed INVENT...

Merge pull request xapi-project#1668 from djs55/from-xenserver-core-x…

…cp-services

Replace ad-hoc config file handling with Xcp_service.configure

HACK: disable SR.probe

Signed-off-by: David Scott <[email protected]>

Update to use new Tar, Tar_unix interface from ocaml-tar 0.2.1

The new ocaml-tar library separates the modules into:

   Tar: for pure OCaml definitions
   Tar_unix: for impure Unix I/O
   Tar_lwt: for impure Lwt I/O

So mostly we have to replace Tar. with Tar_unix. and adjust the
OCAMLPACKS.

Most of this code concerns VM import/export. There is an alternative
implementation which is much more efficient inside recent releases
of vhd-tool, so we should switch to that soon.

Signed-off-by: David Scott <[email protected]>

Conflicts:
	ocaml/xapi/import.ml
	ocaml/xapi/stream_vdi.ml

import_raw_vdi: look for vhd-tool in %{_bindir}

Signed-off-by: David Scott <[email protected]>

stunnel: work around INTERNAL_ERROR: s_poll_wait returned 0, but no d…

…escriptor is ready

When performing a storage migration we see a Tar.Header checksum
mismatch during the initial remote metadata import. The sequence
seems to be:

* ubuntu opens remote SSL connection
* ubuntu writes HTTP PUT
* ubuntu proxies from a local HTTP GET
  -- this appears successful since the right amount of data is
     written to the socket as reported by the debug in the log
* ubuntu closes the file descriptor to stunnel
* stunnel logs an internal error:

INTERNAL ERROR: s_poll_wait returned 0, but no descriptor is ready

* the receiver only receives the HTTP PUT header, not the payload
  -- as measured by tcpdump

The problem only manifests when stunnel is used. The problem goes
away when the timing changes, for example when running xapi under
strace.

We work around this by sending the metadata plaintext. The problem
doesn't manifest using the stunnel version on CentOS.

stunnel versions
  On ubuntu raring: 4.53
  On CentOS 6.4: 4.29-2

Signed-off-by: David Scott <[email protected]>

HACK: disable incremental copies during storage mirroring

The content_id on ffs is usually "", leading to erroneous
incremental copies.

Signed-off-by: David Scott <[email protected]>

nbd: pass the fd to tapdisk if the control socket exists, otherwise u…

…se vhd-tool

Signed-off-by: David Scott <[email protected]>

Merge pull request xapi-project#5 from euanh/djs-fusion

Constants in OCaml should not be all caps  #NOTPYTHON

Merge pull request xapi-project#4 from euanh/djs-fusion

SR: Only consider a filename to be a UUID if it is the correct length