From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6AE457D228 for ; Mon, 8 Nov 2021 15:15:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 68BC526F9F for ; Mon, 8 Nov 2021 15:15:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DEA6426F94 for ; Mon, 8 Nov 2021 15:15:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B7C1541FCA for ; Mon, 8 Nov 2021 15:15:28 +0100 (CET) To: pve-devel@lists.proxmox.com, =?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= References: <20211105130359.40803-1-f.gruenbichler@proxmox.com> <20211105130359.40803-13-f.gruenbichler@proxmox.com> From: Fabian Ebner Message-ID: <9df61960-edb3-1dc2-5e75-993817e9f024@proxmox.com> Date: Mon, 8 Nov 2021 15:15:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211105130359.40803-13-f.gruenbichler@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.243 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.039 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH http-server 1/1] webproxy: handle unflushed write buffer X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2021 14:15:29 -0000 Am 05.11.21 um 14:03 schrieb Fabian Grünbichler: > for proxied requests, we usually tear down the proxy connection > immediately when closing the source connection. this is not the correct > course of action for bulk one-way data streams that are proxied, where > the source connection might be closed, but the proxy connection might > still have data in the write buffer that needs to be written out. > > push_shutdown already handles this case (closing the socket/FH after it > has been fully drained). > > one example for such a proxied data stream is the 'migrate' data for a > remote migration, which gets proxied over a websocket connection. > terminating the proxied connection early makes the target VM crash for > obvious reasons. > > Signed-off-by: Fabian Grünbichler > --- > src/PVE/APIServer/AnyEvent.pm | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm > index 86d0e2e..ecf771f 100644 > --- a/src/PVE/APIServer/AnyEvent.pm > +++ b/src/PVE/APIServer/AnyEvent.pm > @@ -144,7 +144,8 @@ sub client_do_disconnect { > }; > > if (my $proxyhdl = delete $reqstate->{proxyhdl}) { > - &$shutdown_hdl($proxyhdl); > + &$shutdown_hdl($proxyhdl) > + if !$proxyhdl->{block_disconnect}; Style nit: fits in one line ;) I'm not familiar with the code, so I'll just ask: can this be reached without going through the code below first, i.e. can it happen that block_disconnect is not set, but length $proxyhdl->{wbuf} > 0? Or is it not important in other cases (if there are any)? > } > > my $hdl = delete $reqstate->{hdl}; > @@ -627,9 +628,10 @@ sub websocket_proxy { > } elsif ($opcode == 8) { > my $statuscode = unpack ("n", $payload); > $self->dprint("websocket received close. status code: '$statuscode'"); > - if ($reqstate->{proxyhdl}) { > - $reqstate->{proxyhdl}->push_shutdown(); > - } > + if (my $proxyhdl = $reqstate->{proxyhdl}) { > + $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf} > 0; > + $proxyhdl->push_shutdown(); > + } > $hdl->push_shutdown(); > } elsif ($opcode == 9) { > # ping received, schedule pong >