Attachment 591838 Details for Bug 832081 – Proposed patch to disable keepalive

[patch] Proposed patch to disable keepalive

disable-keepalive.patch (text/plain), 2.21 KB, created by Jiri Denemark on 2012-06-14 13:58:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Denemark

Created: 2012-06-14 13:58:00 UTC

Size: 2.21 KB

patch

obsolete

>commit 99216f1d9f05f59867f1b64b4412efb843a9c254
>Author: Jiri Denemark <jdenemar@redhat.com>
>Date:   Thu Jun 14 15:55:20 2012 +0200
>
>    Disable keepalives by default
>    
>    https://bugzilla.redhat.com/show_bug.cgi?id=832081
>    
>    Keepalive support is broken in client RPC.
>
>diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
>index 2cd689b..058b178 100644
>--- a/daemon/libvirtd.c
>+++ b/daemon/libvirtd.c
>@@ -925,8 +925,8 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
>     data->audit_level = 1;
>     data->audit_logging = 0;
> 
>-    data->keepalive_interval = 5;
>-    data->keepalive_count = 5;
>+    data->keepalive_interval = -1;
>+    data->keepalive_count = 0;
>     data->keepalive_required = 0;
> 
>     localhost = virGetHostname(NULL);
>diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
>index 3eab2be..2a6fdb1 100644
>--- a/daemon/libvirtd.conf
>+++ b/daemon/libvirtd.conf
>@@ -382,7 +382,7 @@
> # can still send them and the deamon will send responses.  When
> # keepalive_count is set to 0, connections will be automatically
> # closed after keepalive_interval seconds of inactivity without
>-# sending any keepalive messages.
>+# sending any keepalive messages.  Disabled by default.
> #
> #keepalive_interval = 5
> #keepalive_count = 5
>diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
>index cb87728..82aace4 100644
>--- a/src/qemu/qemu.conf
>+++ b/src/qemu/qemu.conf
>@@ -347,7 +347,7 @@
> # send them and source libvirtd will send responses.  When
> # keepalive_count is set to 0, connections will be automatically
> # closed after keepalive_interval seconds of inactivity without
>-# sending any keepalive messages.
>+# sending any keepalive messages.  Disabled by default.
> #
> #keepalive_interval = 5
> #keepalive_count = 5
>diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
>index 88a04bc..2047618 100644
>--- a/src/qemu/qemu_conf.c
>+++ b/src/qemu/qemu_conf.c
>@@ -122,8 +122,8 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
>           virLockManagerPluginNew("nop", NULL, 0)))
>         return -1;
> 
>-    driver->keepAliveInterval = 5;
>-    driver->keepAliveCount = 5;
>+    driver->keepAliveInterval = -1;
>+    driver->keepAliveCount = 0;
> 
>     /* Just check the file is readable before opening it, otherwise
>      * libvirt emits an error.

Actions: View | Diff

Attachments on bug 832081: 591838