evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[type/__package_opkg] Also lock execution of code-remote

Browse source
This commit is contained in:
Dennis Camera 2020-06-21 13:15:38 +02:00
commit e79b26a61f
2 changed files with 73 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cdist/conf/type/__package_opkg/explorer/pkg_status
View file

@ -23,7 +23,9 @@
# Retrieve the status of a package - parses opkg output # Retrieve the status of a package - parses opkg output
# #
LOCKFILE="${__type_explorer}/cdist_opkg.lock" __type_path=${__object%%${__object_id}*}
LOCKFILE="${__type_path}/cdist_opkg.lock"
_lock() ( _lock() (
set -o noclobber set -o noclobber
until echo $$>"${LOCKFILE}" until echo $$>"${LOCKFILE}"
@ -48,9 +50,10 @@ else
fi fi
# NOTE: We need to lock parallel execution of this explorer because opkg will # NOTE: We need to lock parallel execution of type explorers and code-remote
# try to acquire the OPKG lock (usually /var/lock/opkg.lock) using lockf(2) for # because opkg will try to acquire the OPKG lock (usually /var/lock/opkg.lock)
# every operation. It will not wait for the lock but terminate with an error. # using lockf(2) for every operation.
# It will not wait for the lock but terminate with an error.
# This leads to incorrect 'absent notpresent' statuses when parallel execution # This leads to incorrect 'absent notpresent' statuses when parallel execution
# is enabled. # is enabled.
trap _unlock EXIT trap _unlock EXIT

94
cdist/conf/type/__package_opkg/gencode-remote
View file

@ -2,6 +2,7 @@
# #
# 2011,2013 Nico Schottelius (nico-cdist at schottelius.org) # 2011,2013 Nico Schottelius (nico-cdist at schottelius.org)
# 2012 Giel van Schijndel (giel plus cdist at mortis dot eu) # 2012 Giel van Schijndel (giel plus cdist at mortis dot eu)
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -19,41 +20,78 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# Manage packages on OpenWRT and co. # Manage packages on OpenWrt, optware, and co.
# #
if [ -f "$__object/parameter/name" ]; then if test -f "${__object}/parameter/name"
name="$(cat "$__object/parameter/name")" then
name=$(cat "${__object}/parameter/name")
else else
name="$__object_id" name=$__object_id
fi fi
state_should="$(cat "$__object/parameter/state")" state_should=$(cat "${__object}/parameter/state")
state_is=$(cat "${__object}/explorer/pkg_status")
state_is="$(cat "$__object/explorer/pkg_status")" case $state_is
case "$state_is" in in
absent*) (absent*)
present="$(echo "$state_is" | cut -d ' ' -f 2)" presence=$(echo "${state_is}" | cut -d ' ' -f 2)
state_is="absent" state_is='absent'
;; ;;
esac esac
[ "$state_is" = "$state_should" ] && exit 0 if test "${state_is}" = "${state_should}"
then
exit 0
fi
case "$state_should" in cat <<'EOF'
present) __type_path=${__object%%${__object_id}*}
if [ "$present" = "notpresent" ]; then
echo "opkg --verbosity=0 update" LOCKFILE="${__type_path}/cdist_opkg.lock"
fi _lock() (
echo "opkg --verbosity=0 install '$name'" set -o noclobber
echo "installed" >> "$__messages_out" until echo $$>"${LOCKFILE}"
;; do
absent) while test -f "${LOCKFILE}"; do sleep 1; done
echo "opkg --verbosity=0 remove '$name'" done
echo "removed" >> "$__messages_out"
;; ) 2>/dev/null
*) _unlock() {
echo "Unknown state: ${state_should}" >&2 if test -s "${LOCKFILE}" && test "$(cat "${LOCKFILE}")" = $$
exit 1 then
;; rm "${LOCKFILE}"
fi
}
EOF
# NOTE: We need to lock parallel execution of code-remote to ensure that it is
# not executed concurrently with a type explorer.
# opkg will try to acquire the OPKG lock (usually /var/lock/opkg.lock) using
# lockf(2) for every operation.
# It will not wait for the lock but terminate with an error leading to an
# incorrect outcome.
echo 'trap _unlock EXIT'
echo '_lock'
case $state_should
in
(present)
if test "${presence}" = 'notpresent'
then
echo 'opkg --verbosity=0 update'
fi
printf "opkg --verbosity=0 install '%s'\n" "${name}"
echo 'installed' >>"${__messages_out}"
;;
(absent)
printf "opkg --verbosity=0 remove '%s'" "${name}"
echo 'removed' >>"${__messages_out}"
;;
(*)
printf 'Unknown state: %s\n' "${state_should}" >&2
exit 1
;;
esac esac