* Re: [PR PATCH] [Updated] haproxy: enable hitless reloads
2021-08-09 4:58 [PR PATCH] haproxy: enable hitless reloads zdykstra
@ 2021-08-09 5:25 ` zdykstra
2021-08-10 12:46 ` [PR REVIEW] " ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2021-08-09 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1826 bytes --]
There is an updated pull request by zdykstra against master on the void-packages repository
https://github.com/zdykstra/void-packages haproxy-hitless-reload
https://github.com/void-linux/void-packages/pull/32423
haproxy: enable hitless reloads
Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-hitless-reload-32423.patch --]
[-- Type: text/x-diff, Size: 1767 bytes --]
From 31f137976c4b289e83a90ab5901d9a32922d2d1e Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH] haproxy: enable hitless reloads
Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
srcpkgs/haproxy/files/haproxy.cfg | 1 +
srcpkgs/haproxy/files/haproxy/run | 4 +++-
srcpkgs/haproxy/template | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
chroot /var/lib/haproxy
user haproxy
group haproxy
+ stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
defaults
mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..59d6f810fcce 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,5 @@
#!/bin/sh
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W \
+ -p /var/run/haproxy.pid \
+ -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
# Template file for 'haproxy'
pkgname=haproxy
version=2.4.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
hostmakedepends="lua53-devel"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] haproxy: enable hitless reloads
2021-08-09 4:58 [PR PATCH] haproxy: enable hitless reloads zdykstra
2021-08-09 5:25 ` [PR PATCH] [Updated] " zdykstra
@ 2021-08-10 12:46 ` ericonr
2021-08-10 14:07 ` [PR PATCH] [Updated] " zdykstra
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-10 12:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32423#discussion_r685982142
Comment:
I suppose the PID file is needed for this handling?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] haproxy: enable hitless reloads
2021-08-09 4:58 [PR PATCH] haproxy: enable hitless reloads zdykstra
2021-08-09 5:25 ` [PR PATCH] [Updated] " zdykstra
2021-08-10 12:46 ` [PR REVIEW] " ericonr
@ 2021-08-10 14:07 ` zdykstra
2021-08-10 14:18 ` [PR REVIEW] " zdykstra
2021-08-10 14:20 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2021-08-10 14:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1826 bytes --]
There is an updated pull request by zdykstra against master on the void-packages repository
https://github.com/zdykstra/void-packages haproxy-hitless-reload
https://github.com/void-linux/void-packages/pull/32423
haproxy: enable hitless reloads
Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-hitless-reload-32423.patch --]
[-- Type: text/x-diff, Size: 1731 bytes --]
From 98486ad4613a499a5d6e2cf370bc9f43cbc85fc9 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH] haproxy: enable hitless reloads
Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
srcpkgs/haproxy/files/haproxy.cfg | 1 +
srcpkgs/haproxy/files/haproxy/run | 2 +-
srcpkgs/haproxy/template | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
chroot /var/lib/haproxy
user haproxy
group haproxy
+ stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
defaults
mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
#!/bin/sh
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
# Template file for 'haproxy'
pkgname=haproxy
version=2.4.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
hostmakedepends="lua53-devel"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] haproxy: enable hitless reloads
2021-08-09 4:58 [PR PATCH] haproxy: enable hitless reloads zdykstra
` (2 preceding siblings ...)
2021-08-10 14:07 ` [PR PATCH] [Updated] " zdykstra
@ 2021-08-10 14:18 ` zdykstra
2021-08-10 14:20 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2021-08-10 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/32423#discussion_r686065427
Comment:
It was only storing the PID of the master process, not any of the workers. Removed!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: haproxy: enable hitless reloads
2021-08-09 4:58 [PR PATCH] haproxy: enable hitless reloads zdykstra
` (3 preceding siblings ...)
2021-08-10 14:18 ` [PR REVIEW] " zdykstra
@ 2021-08-10 14:20 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-10 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
There's a merged pull request on the void-packages repository
haproxy: enable hitless reloads
https://github.com/void-linux/void-packages/pull/32423
Description:
Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread