Attachment 613396 Details for Bug 845222 – vdservice: restart vdagent if killed manually

[patch] vdservice: restart vdagent if killed manually

0001-vdservice-restart-vdagent-if-killed-manually.patch (text/plain), 1.45 KB, created by Arnon Gilboa on 2012-09-16 11:04:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Arnon Gilboa

Created: 2012-09-16 11:04:32 UTC

Size: 1.45 KB

patch

obsolete

>From 18f70a3376a1e4a8c0d0a164a21b0be97f4c355a Mon Sep 17 00:00:00 2001
>From: Arnon Gilboa <agilboa@redhat.com>
>Date: Mon, 10 Sep 2012 10:59:14 +0300
>Subject: [PATCH 1/3] vdservice: restart vdagent if killed manually
>
>win7-only issue
>
>rhbz#845222
>---
> vdservice/vdservice.cpp |   10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
>diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp
>index 696f3da..b48cbeb 100644
>--- a/vdservice/vdservice.cpp
>+++ b/vdservice/vdservice.cpp
>@@ -590,6 +590,16 @@ bool VDService::execute()
>                         restart_agent(false);
>                     } else if (_system_version == SYS_VER_WIN_7_CLASS) {
>                         kill_agent();
>+                        // Assume agent was killed due to console disconnect, and wait for agent
>+                        // normal restart due to console connect. If the agent is not alive yet,
>+                        // it was killed manually (or crashed), so let's restart it.
>+                        if (WaitForSingleObject(_control_event, VD_AGENT_RESTART_INTERVAL) ==
>+                                WAIT_OBJECT_0) {
>+                            handle_control_event();
>+                        }
>+                        if (_running && !_agent_alive) {
>+                            restart_agent(false);
>+                        }
>                     }
>                 } else {
>                     if (wait_ret >= WAIT_OBJECT_0 + _events_vdi_port_base &&
>-- 
>1.7.4.1
>

Actions: View | Diff

Attachments on bug 845222: 613396