4:52 a.m.
v1: https://www.redhat.com/archives/libvir-list/2017-September/msg01006.html
Changes from v1:
1. Patches that fixes qemu driver termination are moved out of this series
2. New version of [1] now fixes issue in a way that suggested by reviewer
3. [2] fixes another issue that was discovered in the process of review
Nikolay Shirokovskiy (2):
libvirtd: fix crash on termination [1]
virtlogd: add missing netserver refcount increment on reload [2]
src/locking/lock_daemon.c | 1 +
src/rpc/virnetdaemon.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
--
1.8.3.1
4:52 a.m.
New subject: [libvirt] [PATCH v2 1/2] libvirtd: fix crash on termination
The problem is incorrect order of qemu driver shutdown and shutdown
of netserver threads that serve client requests (thru qemu driver
particularly).
Net server threads are shutdowned upon dispose which is triggered
by last daemon object unref at the end of main function. At the same
time qemu driver is shutdowned earlier in virStateCleanup. As a result
netserver threads see invalid driver object in the middle of request
processing.
Let's move shutting down netserver threads earlier to virNetDaemonClose.
Note: order of last daemon unref and virStateCleanup
is introduced in 85c3a182 for a valid reason.
---
One can use next patch to trigger crash on termination. Call domstats function
and then send TERM to libvirtd.
[2] patch to trigger crash
# diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
# index cf5e4ad..39a57aa 100644
# --- a/src/qemu/qemu_driver.c
# +++ b/src/qemu/qemu_driver.c
# @@ -20144,6 +20144,8 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
# domflags = 0;
# vm = vms[i];
#
# + sleep(5);
# +
# virObjectLock(vm);
#
# if (HAVE_JOB(privflags) &&
src/rpc/virnetdaemon.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index e3b9390..c05df68 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -102,7 +102,8 @@ virNetDaemonDispose(void *obj)
if (dmn->sigwatch > 0)
virEventRemoveHandle(dmn->sigwatch);
- virHashFree(dmn->servers);
+ if (dmn->servers)
+ virHashFree(dmn->servers);
virJSONValueFree(dmn->srvObject);
}
@@ -880,6 +881,8 @@ virNetDaemonClose(virNetDaemonPtr dmn)
virObjectLock(dmn);
virHashForEach(dmn->servers, daemonServerClose, NULL);
+ virHashFree(dmn->servers);
+ dmn->servers = NULL;
virObjectUnlock(dmn);
}
--
1.8.3.1
4:52 a.m.
New subject: [libvirt] [PATCH v2 2/2] virtlogd: add missing netserver refcount increment on reload
After virNetDaemonAddServerPostExec call in virtlogd we should have
netserver refcount set to 2. One goes to netdaemon servers hashtable
and one goes to virtlogd own reference to netserver. Let's add
missing increment in virNetDaemonAddServerPostExec itself while holding
daemon lock.
We also have to unref new extra ref after virtlockd call to
virNetDaemonAddServerPostExec.
---
src/locking/lock_daemon.c | 1 +
src/rpc/virnetdaemon.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index fe3eaf9..41a06b2 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -275,6 +275,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool
privileged)
virLockDaemonClientFree,
(void*)(intptr_t)(privileged ? 0x1 :
0x0))))
goto error;
+ virObjectUnref(srv);
return lockd;
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index c05df68..8dc042b 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -313,6 +313,7 @@ virNetDaemonAddServerPostExec(virNetDaemonPtr dmn,
if (virHashAddEntry(dmn->servers, serverName, srv) < 0)
goto error;
+ virObjectRef(srv);
virJSONValueFree(object);
virObjectUnlock(dmn);
--
1.8.3.1
5:39 a.m.
Please, ignore. Need to resend after syntax check issues fixed.
On 24.10.2017 12:52, Nikolay Shirokovskiy wrote:
v1:
https://www.redhat.com/archives/libvir-list/2017-September/msg01006.html
Changes from v1:
1. Patches that fixes qemu driver termination are moved out of this series
2. New version of [1] now fixes issue in a way that suggested by reviewer
3. [2] fixes another issue that was discovered in the process of review
Nikolay Shirokovskiy (2):
libvirtd: fix crash on termination [1]
virtlogd: add missing netserver refcount increment on reload [2]
src/locking/lock_daemon.c | 1 +
src/rpc/virnetdaemon.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
2577
days inactive
2577
days old
3 comments
1 participants
participants (1)
-
Nikolay Shirokovskiy