Skip to content

Bump NUT master branch from FTY: systemd integration#2346

Merged
jimklimov merged 4 commits intonetworkupstools:masterfrom
jimklimov:master-bump-from-FTY-systemd
Mar 3, 2024
Merged

Bump NUT master branch from FTY: systemd integration#2346
jimklimov merged 4 commits intonetworkupstools:masterfrom
jimklimov:master-bump-from-FTY-systemd

Conversation

@jimklimov
Copy link
Member

@jimklimov jimklimov commented Mar 2, 2024

Follow-up from #2275

These changes pertained to specifically systemd-oriented optimizations for a massively monitoring system (one NUT server watching hundreds of networked UPSes and responding to many clients).

  • nut-server change bumps the allowed count of opened file descriptors (also used for network and UNIX sockets) as far as we can drive it
  • NDE change revises reaction to external processes which generate ups.conf and write it in small pieces (e.g. lines) over time, avoiding that systemd kills the NDE unit as unhealthy

jimklimov and others added 2 commits March 2, 2024 17:24
@jimklimov
nut-driver-enumerator-daemon-activator.service.in : disable quick-sta…
e946480 
…rt throttling
@jimklimov
scripts/systemd/nut-server.service.in: summarize LimitNOFILE increase…
0204418 
… and ExecStartPost to monitor that it was applied, from FTY branch

Originates from FTY commits:

* 062d186 (Jim Klimov    2018-01-16 13:11:08 +0100)
* 0e28cc8 (Jim Klimov    2018-01-16 13:37:39 +0100)
* e9a6710 (Jim Klimov    2018-01-16 13:41:52 +0100)

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov jimklimov added enhancement need testing Code looks reasonable, but the feature would better be tested against hardware or OSes systemd Linux Some issues are specific to Linux as a platform nut-driver-enumerator (NDE) nut-driver-enumerator (NDE) automates service management integration for NUT driver instances etc. Connection stability issues Issues about driver<->device and/or networked connections (upsd<->upsmon...) going AWOL over time labels Mar 2, 2024
@jimklimov jimklimov added this to the 2.8.3 milestone Mar 2, 2024
jimklimov and others added 2 commits March 2, 2024 17:47
@jimklimov
nut-driver-enumerator-daemon-activator.service : use older Service/St…
360514e 
…artLimitInterval for broader compatibility

Should help avoid this warning and unachieved functionality on systemd-229 and older:
* systemd[1]: [/lib/systemd/system/nut-driver-enumerator-daemon-activator.service:30] Unknown lvalue 'StartLimitIntervalSec' in section 'Service'
@jimklimov
scripts/systemd/nut-driver-enumerator-daemon-activator.path.in: clari…
0fbe658 
…fy the unit description (it does not strictly restart the daemon, can reload if running too)

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov jimklimov modified the milestones: 2.8.3, 2.8.2 Mar 3, 2024
@jimklimov
Copy link
Member Author

jimklimov commented Mar 3, 2024

Tested by bombarding with touch /etc/nut/ups.conf

@jimklimov
Copy link
Member Author

jimklimov commented Mar 3, 2024 

root@pve:~# ps -ef | grep [u]psd
nut      2587963       1  0 12:12 ?        00:00:00 /usr/local/ups/sbin/upsd -FF

root@pve:~# cat /proc/2587963/limits
Limit                     Soft Limit           Hard Limit           Units
Max cpu time              unlimited            unlimited            seconds
Max file size             unlimited            unlimited            bytes
Max data size             unlimited            unlimited            bytes
Max stack size            8388608              unlimited            bytes
Max core file size        0                    unlimited            bytes
Max resident set          unlimited            unlimited            bytes
Max processes             514731               514731               processes
Max open files            1048576              1048576              files   <<< THIS
Max locked memory         65536                65536                bytes
Max address space         unlimited            unlimited            bytes
Max file locks            unlimited            unlimited            locks
Max pending signals       514731               514731               signals
Max msgqueue size         819200               819200               bytes
Max nice priority         0                    0
Max realtime priority     0                    0
Max realtime timeout      unlimited            unlimited            us

@jimklimov jimklimov merged commit d6062d3 into networkupstools:master Mar 3, 2024
@jimklimov jimklimov deleted the master-bump-from-FTY-systemd branch March 3, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Connection stability issues Issues about driver<->device and/or networked connections (upsd<->upsmon...) going AWOL over time enhancement Linux Some issues are specific to Linux as a platform need testing Code looks reasonable, but the feature would better be tested against hardware or OSes nut-driver-enumerator (NDE) nut-driver-enumerator (NDE) automates service management integration for NUT driver instances etc. systemd

Projects

None yet

Milestone

2.8.2

Development

Successfully merging this pull request may close these issues.

1 participant

@jimklimov