|
 |
6ae9ed |
From cca396b2a3c1042a0825a3f624a71e06ed65a15b Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <cca396b2a3c1042a0825a3f624a71e06ed65a15b@dist-git>
|
|
|
6ae9ed |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 2 Aug 2016 15:20:54 +0200
|
|
|
6ae9ed |
Subject: [PATCH] rpc: virnetserver: Remove dead code checking the client
|
|
|
6ae9ed |
limits
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Prior to commit 2737aaaf, we allowed every client to connect successfully,
|
|
|
6ae9ed |
however, if accepting a client would eventually lead to an overcommit of the
|
|
|
6ae9ed |
limits, we would disconnect it immediately with "Too many active clients,
|
|
|
6ae9ed |
dropping connection from...". Recent changes refactored the code in a way, that
|
|
|
6ae9ed |
it is not possible for the client-related callback to be dispatched and the
|
|
|
6ae9ed |
client to be accepted if the limits wouldn't permit to do so, therefore a check
|
|
|
6ae9ed |
if a connection should be dropped due to limits violation has become a dead
|
|
|
6ae9ed |
code that could be removed.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit 238b20b47f4be0299d364ec8907edf81e6b55183)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1357776
|
|
|
6ae9ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/rpc/virnetserver.c | 7 -------
|
|
|
6ae9ed |
1 file changed, 7 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
|
|
|
6ae9ed |
index 5b6bc4a..f06643a 100644
|
|
|
6ae9ed |
--- a/src/rpc/virnetserver.c
|
|
|
6ae9ed |
+++ b/src/rpc/virnetserver.c
|
|
|
6ae9ed |
@@ -279,13 +279,6 @@ int virNetServerAddClient(virNetServerPtr srv,
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
virObjectLock(srv);
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- if (srv->nclients >= srv->nclients_max) {
|
|
|
6ae9ed |
- virReportError(VIR_ERR_RPC,
|
|
|
6ae9ed |
- _("Too many active clients (%zu), dropping connection from %s"),
|
|
|
6ae9ed |
- srv->nclients_max, virNetServerClientRemoteAddrStringURI(client));
|
|
|
6ae9ed |
- goto error;
|
|
|
6ae9ed |
- }
|
|
|
6ae9ed |
-
|
|
|
6ae9ed |
if (virNetServerClientInit(client) < 0)
|
|
|
6ae9ed |
goto error;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|