Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 May 2023 11:56:04 GMT
From:      Kirill Ponomarev <krion@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 22e3c4c9124f - 2023Q2 - sysutils/py-salt: Increase receive buffer size to prevent a hanging minion
Message-ID:  <202305161156.34GBu4Wo064023@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by krion:

URL: https://cgit.FreeBSD.org/ports/commit/?id=22e3c4c9124f0d2759d2e7b8358efdf128fa887e

commit 22e3c4c9124f0d2759d2e7b8358efdf128fa887e
Author:     Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2023-05-16 11:53:29 +0000
Commit:     Kirill Ponomarev <krion@FreeBSD.org>
CommitDate: 2023-05-16 11:56:01 +0000

    sysutils/py-salt: Increase receive buffer size to prevent a hanging minion
    
    PR:             271367
    Reported by:    Johan Söllvander <jsollvander_axcient_dot_com>, kevans
    
    (cherry picked from commit 0d7e53d13126b21df43ab7dfd726844feaff58ac)
---
 sysutils/py-salt/Makefile                                 |  2 +-
 sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index b32abac6a4de..25bd78b9f2e3 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	salt
 PORTVERSION=	3005.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py
new file mode 100644
index 000000000000..4a163d249474
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py
@@ -0,0 +1,10 @@
+--- salt/ext/tornado/iostream.py.orig	2023-05-16 11:50:28 UTC
++++ salt/ext/tornado/iostream.py
+@@ -1116,6 +1116,7 @@ class IOStream(BaseIOStream):
+             future = self._connect_future = TracebackFuture()
+         try:
+             self.socket.connect(address)
++            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 524288)
+         except socket.error as e:
+             # In non-blocking mode we expect connect() to raise an
+             # exception with EINPROGRESS or EWOULDBLOCK.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305161156.34GBu4Wo064023>