projects
/
sysadmin-cookbook
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remote device rw on start
[sysadmin-cookbook]
/
recepies
/
lxc
/
lxc-watchdog.sh
diff --git
a/recepies/lxc/lxc-watchdog.sh
b/recepies/lxc/lxc-watchdog.sh
index
d8c87a1
..
93ffcfe
100755
(executable)
--- a/
recepies/lxc/lxc-watchdog.sh
+++ b/
recepies/lxc/lxc-watchdog.sh
@@
-16,6
+16,10
@@
#
# based on Tony Risinger post to lxc-users mailing list
# http://www.mail-archive.com/lxc-users@lists.sourceforge.net/msg00074.html
#
# based on Tony Risinger post to lxc-users mailing list
# http://www.mail-archive.com/lxc-users@lists.sourceforge.net/msg00074.html
+#
+# Install with:
+# ln -sf /srv/sysadmin-cookbook/recepies/lxc/lxc-watchdog.sh /etc/init.d/lxc-watchdog
+# update-rc.d lxc-watchdog defaults
which inotifywait >/dev/null || apt-get install inotify-tools
which inotifywait >/dev/null || apt-get install inotify-tools
@@
-33,16
+37,28
@@
lxc_exists() {
lxc_rootfs() {
lxc_rootfs() {
- grep lxc.rootfs "/var/lib/lxc/$1/config" | cut -d= -f2 | sed 's/^ *//'
+ grep '^ *lxc\.rootfs *=' "/var/lib/lxc/$1/config" | cut -d= -f2 | sed 's/^ *//'
+}
+
+lxc_hostname() {
+ inside=`cat $(lxc_rootfs $1)/etc/hostname`
+ config=`grep lxc.utsname /var/lib/lxc/$name/config | cut -d= -f2`
+ echo "$config [$inside]";
}
}
+lxc_ip() {
+ ( grep lxc.network.ipv4 /var/lib/lxc/$name/config | grep -v '^#' | cut -d= -f2 || \
+ grep address $(lxc_rootfs $name)/etc/network/interfaces | grep -v '^#' | sed 's/.*address //' ) | \
+ head -1 | \
+ sed -e 's/ *//g' -e 's/\/.*$//'
+}
lxc_status() {
lxc_status() {
-
lxc-ls -1
| sort -u | xargs -i lxc-info -n {} | sed "s/'//g" | while read name is status ; do
-
on_boot="
"
- test -s /var/lib/lxc/$name/on_boot &&
on_boot="on_
boot"
- echo "$name $status $
on_boot $(lxc_rootfs
$name)"
- done
+
( find /var/lib/lxc/ -name "config" | cut -d/ -f5
| sort -u | xargs -i lxc-info -n {} | sed "s/'//g" | while read name is status ; do
+
boot="-
"
+ test -s /var/lib/lxc/$name/on_boot &&
boot="
boot"
+ echo "$name $status $
boot $(lxc_rootfs $name) $(lxc_ip $name) $(lxc_hostname
$name)"
+ done
) | column -t
}
}
@@
-50,10
+66,16
@@
cleanup_init_scripts() {
rootfs=$(lxc_rootfs $1)
ls \
rootfs=$(lxc_rootfs $1)
ls \
+ $rootfs/etc/rc?.d/*checkroot* \
$rootfs/etc/rc?.d/*umountfs \
$rootfs/etc/rc?.d/*umountroot \
$rootfs/etc/rc?.d/*hwclock* \
$rootfs/etc/rc?.d/*umountfs \
$rootfs/etc/rc?.d/*umountroot \
$rootfs/etc/rc?.d/*hwclock* \
+ $rootfs/etc/rc?.d/*udev* \
+ $rootfs/etc/rc?.d/*checkfs* \
2>/dev/null | xargs -i rm -v {}
2>/dev/null | xargs -i rm -v {}
+
+ echo $1 > $rootfs/etc/hostname
+ grep $1 $rootfs/etc/hosts || echo "$(lxc_ip $1) $1" >> $rootfs/etc/hosts
}
}
@@
-64,7
+86,7
@@
setup_inittab() {
# let container respond to kill -SIGPWR
inittab=$rootfs/etc/inittab
# let container respond to kill -SIGPWR
inittab=$rootfs/etc/inittab
- if ! grep "$add" ${inittab} >/dev/null ; then
+ if
test -e $inittab &&
! grep "$add" ${inittab} >/dev/null ; then
grep -v "$remove" ${inittab} > ${inittab}.new
echo $add >> ${inittab}.new
mv ${inittab}.new ${inittab}
grep -v "$remove" ${inittab} > ${inittab}.new
echo $add >> ${inittab}.new
mv ${inittab}.new ${inittab}
@@
-73,6
+95,11
@@
setup_inittab() {
}
}
+lxc_log() {
+ echo `date +%Y-%m-%dT%H:%M:%S` $*
+}
+
+
lxc_kill() {
name=$1
sig=$2
lxc_kill() {
name=$1
sig=$2
@@
-82,22
+109,32
@@
lxc_kill() {
lxc-info -n $name
exit 1
fi
lxc-info -n $name
exit 1
fi
-
echo
"$name kill $sig $init_pid"
+
lxc_log
"$name kill $sig $init_pid"
/bin/kill $sig $init_pid
}
lxc_stop() {
/bin/kill $sig $init_pid
}
lxc_stop() {
+ lxc_log "$name stop"
lxc_kill $name -SIGPWR
lxc-wait -n $name -s STOPPED
lxc_kill $name -SIGPWR
lxc-wait -n $name -s STOPPED
+ lxc_log "$name stoped"
# rm -f /var/lib/lxc/${name}/on_boot
}
lxc_start() {
name=$1
# rm -f /var/lib/lxc/${name}/on_boot
}
lxc_start() {
name=$1
+ rootfs=$(lxc_rootfs $1)
+
+ if [ ! -e $rootfs ] ; then
+ echo "ERROR $name rootfs $rootfs not found"
+ return
+ fi
if ! lxc-info -n $name | grep RUNNING ; then
if ! lxc-info -n $name | grep RUNNING ; then
- echo "$name start"
+ lxc_log "$name start"
+ dev=`df -P $rootfs | tail -1 | cut -d" " -f1`
+ mount $dev -o remount,rw # fix debian upgrade which remounts dir ro
lxc-start -n $name -o /tmp/${name}.log -d
lxc-wait -n $name -s RUNNING
lxc-info -n $name
lxc-start -n $name -o /tmp/${name}.log -d
lxc-wait -n $name -s RUNNING
lxc-info -n $name
@@
-112,24
+149,30
@@
rootfs=$(lxc_rootfs $1)
while true; do
vps_utmp=${rootfs}/var/run/utmp
tasks=`wc -l < /cgroup/${name}/tasks`
while true; do
vps_utmp=${rootfs}/var/run/utmp
tasks=`wc -l < /cgroup/${name}/tasks`
+ stop_on=1 # init
+ sulogins=`lxc-ps --name backuppc | grep sulogin | wc -l`
+ if [ "$sulogins" -gt 0 ] ; then
+ stop_on=`expr $stop_on + $sulogins`
+ fi
+
test -z "$tasks" && exit 1
test -z "$tasks" && exit 1
- if [ "$tasks" -eq
1
]; then
+ if [ "$tasks" -eq
$stop_on
]; then
runlevel="$(runlevel ${vps_utmp})"
runlevel="$(runlevel ${vps_utmp})"
-
echo `date +%Y-%m-%dT%H:%M:%S`
"$name runlevel $runlevel"
+
lxc_log
"$name runlevel $runlevel"
case $runlevel in
N*)
# nothing for new boot state
;;
??0)
case $runlevel in
N*)
# nothing for new boot state
;;
??0)
-
echo
"$name halt"
+
lxc_log
"$name halt"
lxc-stop -n "${name}"
lxc-wait -n ${name} -s STOPPED
break
;;
??6)
lxc-stop -n "${name}"
lxc-wait -n ${name} -s STOPPED
break
;;
??6)
-
echo
"$name reboot";
+
lxc_log
"$name reboot";
lxc-stop -n ${name}
lxc-wait -n ${name} -s STOPPED
lxc-start -d -n ${name} -o /tmp/${name}.log
lxc-stop -n ${name}
lxc-wait -n ${name} -s STOPPED
lxc-start -d -n ${name} -o /tmp/${name}.log
@@
-141,18
+184,23
@@
while true; do
;;
esac
else
;;
esac
else
-
echo "# $name $tasks tasks
"
+
lxc_log "$name $tasks tasks $sulogins console
"
fi
# time of 5 minutes on it JUST IN CASE...
inotifywait -qqt 300 ${vps_utmp}
done
fi
# time of 5 minutes on it JUST IN CASE...
inotifywait -qqt 300 ${vps_utmp}
done
-
echo "${name}
exited"
+
lxc_log "$name watchdog
exited"
}
}
+usage() {
+ echo "Usage: $0 {start|stop|restart|status|boot|disable} [name name ... ]" >&2
+ exit 3
+}
+
command_on_lxc() {
command=$1
shift
command_on_lxc() {
command=$1
shift
@@
-164,10
+212,12
@@
case "$command" in
start)
lxc_exists $1
cleanup_init_scripts $1
start)
lxc_exists $1
cleanup_init_scripts $1
- setup_inittab $1 ::power "p0::powerfail:/sbin/init 0"
- setup_inittab $1 ::ctrlaltdel "p6::ctrlaltdel:/sbin/init 6"
+ setup_inittab $1 ":respawn:/sbin/getty.*tty1" "c1:12345:respawn:/sbin/getty 38400 tty1 linux"
+ setup_inittab $1 "::power" "p0::powerfail:/sbin/init 0"
+ setup_inittab $1 "::ctrlaltdel" "p6::ctrlaltdel:/sbin/init 6"
lxc_start $1
lxc_start $1
- ( nohup $0 watchdog $1 >> /tmp/$1.log 2>/dev/null ) &
+ # give container 5 seconds to start more than one process
+ ( sleep 5 ; nohup $0 watchdog $1 >> /tmp/$1.log 2>/dev/null ) &
;;
stop|halt)
lxc_exists $1
;;
stop|halt)
lxc_exists $1
@@
-179,9
+229,14
@@
reload|force-reload|restart|reboot)
watchdog)
lxc_watchdog $1
;;
watchdog)
lxc_watchdog $1
;;
+boot)
+ echo $1 > /var/lib/lxc/$1/on_boot
+ ;;
+disable)
+ echo -n > /var/lib/lxc/$1/on_boot
+ ;;
*)
*)
- echo "Usage: $0 {start|stop|restart|status}" >&2
- exit 3
+ usage
;;
esac
;;
esac
@@
-189,14
+244,18
@@
esac
}
command=$1
}
command=$1
-shift
-
+test -z "$command" && usage
test "$command" = "status" && lxc_status && exit
test "$command" = "status" && lxc_status && exit
+shift
if [ -z "$1" ] ; then
ls /var/lib/lxc/*/on_boot | while read path ; do
name=`echo $path | cut -d/ -f5`
if [ -z "$1" ] ; then
ls /var/lib/lxc/*/on_boot | while read path ; do
name=`echo $path | cut -d/ -f5`
- command_on_lxc $command $name
+ if [ "$command" != "start" -o "$command" = "start" -a -s $path ] ; then
+ command_on_lxc $command $name
+ else
+ echo "# skip $command $name"
+ fi
done
else
while [ ! -z "$1" ] ; do
done
else
while [ ! -z "$1" ] ; do