Skip to content

unbound: prevent reloading local-data every 5 minutes for unchanged records in odhcpd.sh (longtime) #28111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkool702 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

unbound: prevent reloading local-data every 5 minutes for unchanged records in odhcpd.sh (longtime) #28111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6d7fe
unbound: prevent reloading local-data every 5 minutes for unchanged r…
jkool702 Dec 18, 2025
e82b0ed
Refactor common record filtering in odhcpd.sh
jkool702 Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions net/unbound/files/odhcpd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ odhcpd_zonedata() {
local dns_ls_del=$UB_VARDIR/dhcp_dns.del
local dns_ls_new=$UB_VARDIR/dhcp_dns.new
local dns_ls_old=$UB_VARDIR/dhcp_dns.old
local dns_ls_com=$UB_VARDIR/dhcp_dns.common
local dhcp_ls_new=$UB_VARDIR/dhcp_lease.new

if [ ! -f $UB_DHCP_CONF ] || [ ! -f $dns_ls_old ] ; then
Expand Down Expand Up @@ -95,17 +96,31 @@ odhcpd_zonedata() {
;;

longtime)
# Only process true lease changes to reduce Unbound reloads and memory spikes
awk -v conffile=$UB_DHCP_CONF -v pipefile=$dns_ls_new \
-v domain=$dhcp_domain -v bslaac=$dhcp4_slaac6 \
-v bisolt=0 -v bconf=1 -v exclude_ipv6_ga=$exclude_ipv6_ga \
-f /usr/lib/unbound/odhcpd.awk $dhcp_ls_new

awk '{ print $1 }' $dns_ls_old | sort | uniq > $dns_ls_del
cp $dns_ls_new $dns_ls_add
cp $dns_ls_new $dns_ls_old
cat $dns_ls_del | $UB_CONTROL_CFG local_datas_remove
cat $dns_ls_add | $UB_CONTROL_CFG local_datas
rm -f $dns_ls_new $dns_ls_del $dns_ls_add $dhcp_ls_new
awk '{ print $1 }' $dns_ls_old | sort | uniq > "${dns_ls_del}.0"
cp "$dns_ls_new" "${dns_ls_add}.0"
cp "$dns_ls_new" "$dns_ls_old"

# Determine common elements (in joined data+ptr records)
cat "${dns_ls_add}.0" "${dns_ls_del}.0" | tr '\n' $'\034' | sed -E 's/( IN PTR [^'$'\034'']+)'$'\034''/\1\n/g' | \
sort | uniq -d > "${dns_ls_com}"

# Filter out common records from del and add lists
tr '\n' $'\034' <"${dns_ls_del}.0" | sed -E 's/( IN PTR [^'$'\034'']+)'$'\034''/\1\n/g' | \
grep -vF --file="${dns_ls_com}" | sed -E 's/'$'\034''/\n/g; s/^ //' >"${dns_ls_del}"
tr '\n' $'\034' <"${dns_ls_add}.0" | sed -E 's/( IN PTR [^'$'\034'']+)'$'\034''/\1\n/g' | \
grep -vF --file="${dns_ls_com}" | sed -E 's/'$'\034''/\n/g; s/^ //' >"${dns_ls_add}"

# Apply only real changes
[ -s "${dns_ls_del}" ] && cat "${dns_ls_del}" | $UB_CONTROL_CFG local_datas_remove
[ -s "${dns_ls_add}" ] && cat "${dns_ls_add}" | $UB_CONTROL_CFG local_datas

rm -f "$dns_ls_new" "$dns_ls_del" "$dns_ls_add" "$dhcp_ls_new" "${dns_ls_del}.0" "${dns_ls_add}.0" "${dns_ls_com}"
;;

increment)
Expand Down