On 06/02/2011 01:40 PM, Cole Robinson wrote:
> Add a simple handshake with the lxc_controller process so we can detect
> process startup failures. We do this by adding a new --handshake cli arg
> to lxc_controller for passing a file descriptor. If the process fails to
> launch, we scrape all output from the logfile and report it to the user.
>
> Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
> ---
> src/lxc/lxc_container.c | 2 +-
> src/lxc/lxc_container.h | 1 +
> src/lxc/lxc_controller.c | 33 +++++++++++++-
> src/lxc/lxc_driver.c | 107 +++++++++++++++++++++++++++++++++++++++++++++-
> 4 files changed, 137 insertions(+), 6 deletions(-)
>
> @@ -1489,6 +1572,12 @@ static int lxcVmStart(virConnectPtr conn,
> if (virCommandRun(cmd, NULL) < 0)
> goto cleanup;
>
> + if (VIR_CLOSE(handshakefds[1]) < 0) {
> + virReportSystemError(errno, "%s", _("could not close handshake fd"));
> + goto cleanup;
> + }
> + handshakefds[1] = -1;
This line is redundant; the VIR_CLOSE() above already set this to -1.
ACK with that nit fixed, post-release.
--
Eric Blake eblake@xxxxxxxxxx +1-801-349-2682
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list