From 31555bcb6555d080e7072fba2fc8ccda0fd59eaa Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 12 Apr 2018 11:59:07 +0200 Subject: Implement Multipleslave This patch implement multiple slave support. Instead of having a maximum of one master and one slave in one docker image, it is now possible to have multiple slave accross several docker host. For helping this change, a new boards.yaml format is introduced (See README.md for details) Note that tokens.yaml is also squashed in boards.yaml --- lava-slave/scripts/extra_actions | 0 lava-slave/scripts/retire.sh | 43 ++++++++++++++++ lava-slave/scripts/setdispatcherip.py | 11 +++++ lava-slave/scripts/setup.sh | 93 +++++++++++++++++++++++++++++++++++ lava-slave/scripts/start.sh | 3 ++ 5 files changed, 150 insertions(+) create mode 100644 lava-slave/scripts/extra_actions create mode 100755 lava-slave/scripts/retire.sh create mode 100644 lava-slave/scripts/setdispatcherip.py create mode 100755 lava-slave/scripts/setup.sh (limited to 'lava-slave/scripts') diff --git a/lava-slave/scripts/extra_actions b/lava-slave/scripts/extra_actions new file mode 100644 index 0000000..e69de29 diff --git a/lava-slave/scripts/retire.sh b/lava-slave/scripts/retire.sh new file mode 100755 index 0000000..def6c8e --- /dev/null +++ b/lava-slave/scripts/retire.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +LAVA_MASTER_URI=$1 + +if [ -z "$LAVA_MASTER_URI" ];then + echo "retire.sh: remove an offline worker" + echo "Usage: $0 LAVA_MASTER_URI" + echo "ERROR: Missing LAVA_MASTER_URI" + exit 11 +fi + +LAVACLIOPTS="--uri $LAVA_MASTER_URI" + +retire_worker() { + worker=$1 + lavacli $LAVACLIOPTS workers list |grep -q $worker + if [ $? -eq 0 ];then + echo "Removing $worker" + lavacli $LAVACLIOPTS workers update $worker || exit $? + else + echo "SKIP: worker $worker does not exists" + return 0 + fi + lavacli $LAVACLIOPTS devices list -a | grep '^\*' | cut -d' ' -f2 | + while read devicename + do + lavacli $LAVACLIOPTS devices show $devicename |grep -q "^worker.*$worker$" + if [ $? -eq 0 ];then + echo "Retire $devicename" + lavacli $LAVACLIOPTS devices update --health RETIRED --worker $worker $devicename || exit $? + fi + done + return 0 +} + +if [ -z "$2" ];then + for ww in $(ls devices/) + do + retire_worker $ww + done +else + retire_worker $2 +fi diff --git a/lava-slave/scripts/setdispatcherip.py b/lava-slave/scripts/setdispatcherip.py new file mode 100644 index 0000000..a058cba --- /dev/null +++ b/lava-slave/scripts/setdispatcherip.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +import xmlrpclib +import sys + +if len(sys.argv) < 4: + print("ERROR: Usage: %s URI workername dispatcherIP" % sys.argv[0]) + sys.exit(1) + +server = xmlrpclib.ServerProxy("%s" % sys.argv[1]) +server.scheduler.workers.set_config("%s" % sys.argv[2], "dispatcher_ip: %s" % sys.argv[3]) diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh new file mode 100755 index 0000000..bf91c7a --- /dev/null +++ b/lava-slave/scripts/setup.sh @@ -0,0 +1,93 @@ +#!/bin/bash + +if [ ! -e "/root/devices/$(hostname)" ];then + echo "Static slave for $LAVA_MASTER" + exit 0 +fi + +if [ -z "$LAVA_MASTER_URI" ];then + echo "ERROR: Missing LAVA_MASTER_URI" + exit 11 +fi + +echo "Dynamic slave for $LAVA_MASTER ($LAVA_MASTER_URI)" +cd /root/lavacli +LAVACLIOPTS="--uri $LAVA_MASTER_URI" + +# do a sort of ping for letting master to be up +TIMEOUT=30 +while [ $TIMEOUT -ge 1 ]; +do + lavacli $LAVACLIOPTS device-types list 2>/dev/null >/dev/null + if [ $? -eq 0 ];then + TIMEOUT=0 + else + echo "Wait for master...." + sleep 2 + fi + TIMEOUT=$(($TIMEOUT-1)) +done + +# This directory is used for storing device-types already added +mkdir -p /root/.lavadocker/ +if [ -e /root/device-types ];then + for i in $(ls /root/device-types/*jinja2) + do + devicetype=$(basename $i |sed 's,.jinja2,,') + echo "Adding custom $devicetype" + lavacli $LAVACLIOPTS device-types list || exit $? + touch /root/.lavadocker/devicetype-$devicetype + done +fi + +for worker in $(ls /root/devices/) +do + lavacli $LAVACLIOPTS workers list |grep -q $worker + if [ $? -eq 0 ];then + echo "Remains of $worker, cleaning it" + /usr/local/bin/retire.sh $LAVA_MASTER_URI $worker + #lavacli $LAVACLIOPTS workers update $worker || exit $? + else + echo "Adding worker $worker" + lavacli $LAVACLIOPTS workers add --description "LAVA dispatcher on $(cat /root/phyhostname)" $worker || exit $? + fi + if [ ! -z "$LAVA_DISPATCHER_IP" ];then + echo "Add dispatcher_ip $LAVA_DISPATCHER_IP to $worker" + /usr/local/bin/setdispatcherip.py $LAVA_MASTER_URI $worker $LAVA_DISPATCHER_IP || exit $? + fi + for device in $(ls /root/devices/$worker/) + do + devicename=$(echo $device | sed 's,.jinja2,,') + devicetype=$(grep -h extends /root/devices/$worker/$device| grep -o '[a-zA-Z0-9_-]*.jinja2' | sed 's,.jinja2,,') + if [ -e /root/.lavadocker/devicetype-$devicetype ];then + echo "Skip devicetype $devicetype" + else + echo "Add devicetype $devicetype" + lavacli $LAVACLIOPTS device-types list | grep -q "$devicetype[[:space:]]" + if [ $? -eq 0 ];then + echo "Skip devicetype $devicetype" + else + lavacli $LAVACLIOPTS device-types add $devicetype || exit $? + fi + touch /root/.lavadocker/devicetype-$devicetype + fi + echo "Add device $devicename on $worker" + lavacli $LAVACLIOPTS devices list -a | grep -q $devicename + if [ $? -eq 0 ];then + echo "$devicename already present" + #verify if present on another worker + #TODO + lavacli $LAVACLIOPTS devices show $devicename |grep ^worker |grep -q $worker + if [ $? -ne 0 ];then + echo "ERROR: $devicename already present on another worker" + exit 1 + fi + lavacli $LAVACLIOPTS devices update --worker $worker --health UNKNOWN $devicename || exit $? + # always reset the device dict in case of update of it + lavacli $LAVACLIOPTS devices dict set $devicename /root/devices/$worker/$device || exit $? + else + lavacli $LAVACLIOPTS devices add --type $devicetype --worker $worker $devicename || exit $? + lavacli $LAVACLIOPTS devices dict set $devicename /root/devices/$worker/$device || exit $? + fi + done +done diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index 92e76bb..35e58a4 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -1,4 +1,7 @@ #!/bin/bash + +/setup.sh || exit $? + # Set LAVA Master IP if [[ -n "$LAVA_MASTER" ]]; then sed -i -e "s/{LAVA_MASTER}/$LAVA_MASTER/g" /etc/lava-dispatcher/lava-slave -- cgit 1.2.3-korg From 3588f8dc3fb68b3cc21178f3722e980dd9369d2a Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 21 May 2018 11:18:01 +0200 Subject: Upgrade to 2018.4 This patch upgrade lava-docker to LAVA 2018.4 --- common/build-lava | 76 +++++++++++------------- lava-master/Dockerfile | 22 +++++-- lava-master/scripts/lava-logs | 97 +++++++++++++++++++++++++++++++ lava-master/scripts/lava-master | 97 +++++++++++++++++++++++++++++++ lava-master/scripts/lava-server-gunicorn | 99 ++++++++++++++++++++++++++++++++ lava-master/scripts/lava-slave | 98 +++++++++++++++++++++++++++++++ lava-master/scripts/start.sh | 16 +++--- lava-master/scripts/stop.sh | 4 +- lava-slave/Dockerfile | 11 ++-- lava-slave/scripts/lava-slave | 98 +++++++++++++++++++++++++++++++ 10 files changed, 556 insertions(+), 62 deletions(-) create mode 100644 lava-master/scripts/lava-logs create mode 100644 lava-master/scripts/lava-master create mode 100644 lava-master/scripts/lava-server-gunicorn create mode 100644 lava-master/scripts/lava-slave create mode 100644 lava-slave/scripts/lava-slave (limited to 'lava-slave/scripts') diff --git a/common/build-lava b/common/build-lava index e1a8e3b..3ddc696 100644 --- a/common/build-lava +++ b/common/build-lava @@ -24,7 +24,7 @@ lava-server) build-essential \ docbook-xsl \ xsltproc \ - gunicorn \ + gunicorn3 \ ntp \ nodejs \ node-uglify \ @@ -33,37 +33,26 @@ lava-server) libjs-jquery-watermark \ libjs-jquery-flot \ libjs-jquery-ui \ - python-django \ - python-json-schema-validator \ - python-configglue \ - python-twisted\ - python-guestfs \ - python-configobj \ - python-lzma \ - python-magic \ - python-netifaces \ - python-nose \ - python-pexpect \ - python-pyudev \ - python-requests \ - python-yaml \ - python-zmq \ + python3-django-restricted-resource \ + python3-django-auth-ldap \ + python3-django-tables2 \ + python3-django \ + python3-guestfs \ + python3-netifaces \ + python3-markdown \ + python3-nose \ + python3-pexpect \ + python3-psycopg2 \ + python3-requests \ + python3-simplejson \ + python3-yaml \ + python3-zmq \ python3-sphinx-bootstrap-theme \ pep8 \ python-pep8 \ - python-voluptuous \ - python-dateutil \ - python-django-auth-ldap \ - python-django-restricted-resource \ - python-django-tables2 \ - python-docutils \ - python-jinja2 \ - python-markdown \ - python-psycopg2 \ - python-voluptuous \ - python-sphinx \ - python-sphinx-bootstrap-theme \ - python-mocker \ + python3-voluptuous \ + python3-dateutil \ + python3-voluptuous \ systemd-sysv \ tftpd-hpa \ lxc \ @@ -75,24 +64,23 @@ lava-server) ;; lava-dispatcher) # build dependencies - DEBIAN_FRONTEND=noninteractive apt-get -y install python-setuptools || exit $? + DEBIAN_FRONTEND=noninteractive apt-get -y install python3-setuptools || exit $? # package dependencies - DEBIAN_FRONTEND=noninteractive apt-get -y install python-serial \ - python-daemon \ - python-guestfs \ + DEBIAN_FRONTEND=noninteractive apt-get -y install \ + python3-serial \ + python3-configobj \ + python3-pyudev \ + python3-setproctitle \ + python3-guestfs \ sudo \ telnet \ - python-configobj \ - python-lzma \ - python-magic \ - python-netifaces \ - python-nose \ - python-pexpect \ - python-pyudev \ - python-requests \ - python-tz \ - python-yaml \ - python-zmq || exit $? + systemd-sysv \ + python3-netifaces \ + python3-nose \ + python3-pexpect \ + python3-requests \ + python3-yaml \ + python3-zmq || exit $? ;; *) echo "Unknow compoments $1" diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index b475c8c..581999a 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -1,5 +1,7 @@ FROM bitnami/minideb:stretch +RUN echo "deb http://ftp.fr.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list + RUN apt-get update # Add services helper utilities to start and stop LAVA @@ -46,10 +48,10 @@ RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y in # Install latest COPY scripts/build-lava / -RUN bash /build-lava lava-dispatcher 2017.11 2017.11.post1-1 -RUN service postgresql start && \ - bash /build-lava lava-server 2017.11 2017.11.post1-1 && \ - /stop.sh +RUN bash /build-lava lava-dispatcher 2018.4 2018.4-1 +RUN /etc/init.d/postgresql start && \ + bash /build-lava lava-server 2018.4 2018.4-1 && \ + /etc/init.d/postgresql stop RUN a2enmod proxy \ && a2enmod proxy_http \ @@ -62,6 +64,18 @@ RUN git clone https://github.com/BayLibre/lava-healthchecks.git RUN cp lava-healthchecks/health-checks/* /etc/lava-server/dispatcher-config/health-checks/ COPY health-checks/* /etc/lava-server/dispatcher-config/health-checks/ +# Add services helper utilities to start and stop LAVA +COPY scripts/stop.sh . +COPY scripts/start.sh . +COPY scripts/lava-logs /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-logs +COPY scripts/lava-master /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-master +COPY scripts/lava-slave /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-slave +COPY scripts/lava-server-gunicorn /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-server-gunicorn + COPY devices/ /root/devices/ COPY device-types/ /root/device-types/ COPY users/ /root/lava-users/ diff --git a/lava-master/scripts/lava-logs b/lava-master/scripts/lava-logs new file mode 100644 index 0000000..69b2f82 --- /dev/null +++ b/lava-master/scripts/lava-logs @@ -0,0 +1,97 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lava-logs +# Required-Start: $time +# Required-Stop: $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: lava-logs +# Description: lava-logs +### END INIT INFO + +# +# Author: Corentin LABBE +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="lava-logs" +NAME=lava-logs +LOGLEVEL=DEBUG + +DAEMON=/usr/bin/lava-server +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +[ -r /etc/lava-server/$NAME ] && . /etc/lava-server/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- manage lava-logs --level $LOGLEVEL $SOCKET $MASTER_SOCKET $IPV6 $ENCRYPT $MASTER_CERT $SLAVES_CERTS +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0) + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + restart|force-reload) + $0 stop + $0 start + ;; + try-restart) + $0 status >/dev/null 2>&1 && $0 restart + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|try-restart|status}" >&2 + exit 3 + ;; +esac + +: + diff --git a/lava-master/scripts/lava-master b/lava-master/scripts/lava-master new file mode 100644 index 0000000..3bd75aa --- /dev/null +++ b/lava-master/scripts/lava-master @@ -0,0 +1,97 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lava-master +# Required-Start: $time +# Required-Stop: $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: lava-master +# Description: lava-master +### END INIT INFO + +# +# Author: Corentin LABBE +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="lava-master" +NAME=lava-master +LOGLEVEL=DEBUG + +DAEMON=/usr/bin/lava-server +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +[ -r /etc/lava-server/$NAME ] && . /etc/lava-server/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- manage lava-master --level $LOGLEVEL $SOCKET $MASTER_SOCKET $IPV6 $ENCRYPT $MASTER_CERT $SLAVES_CERTS +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0) + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + restart|force-reload) + $0 stop + $0 start + ;; + try-restart) + $0 status >/dev/null 2>&1 && $0 restart + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|try-restart|status}" >&2 + exit 3 + ;; +esac + +: + diff --git a/lava-master/scripts/lava-server-gunicorn b/lava-master/scripts/lava-server-gunicorn new file mode 100644 index 0000000..217ad57 --- /dev/null +++ b/lava-master/scripts/lava-server-gunicorn @@ -0,0 +1,99 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lava-server-gunicorn +# Required-Start: $time +# Required-Stop: $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: lava-server-gunicorn +# Description: lava-server-gunicorn +### END INIT INFO + +# +# Author: Corentin LABBE +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="lava-server-gunicorn" +NAME=lava-server-gunicorn +LOGLEVEL=DEBUG +WORKERS=4 +LOGFILE=/var/log/lava-server/gunicorn.log +RELOAD= +DAEMON=/usr/bin/gunicorn3 +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +[ -r /etc/lava-server/$NAME ] && . /etc/lava-server/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- lava_server.wsgi --log-level $LOGLEVEL --log-file $LOGFILE -u lavaserver -g lavaserver --workers $WORKERS $RELOAD +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0) + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + restart|force-reload) + $0 stop + $0 start + ;; + try-restart) + $0 status >/dev/null 2>&1 && $0 restart + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|try-restart|status}" >&2 + exit 3 + ;; +esac + +: + diff --git a/lava-master/scripts/lava-slave b/lava-master/scripts/lava-slave new file mode 100644 index 0000000..3ba00f7 --- /dev/null +++ b/lava-master/scripts/lava-slave @@ -0,0 +1,98 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lava-slave +# Required-Start: $time +# Required-Stop: $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: lava-slave +# Description: lava-slave +### END INIT INFO + +# +# Author: Corentin LABBE +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="lava-slave" +NAME=lava-slave + +DAEMON=/usr/bin/lava-slave +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +MASTER_URL=tcp://localhost:5556 +LOGGER_URL=tcp://localhost:5555 +LOGLEVEL=DEBUG + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME +[ -r /etc/lava-dispatcher/$NAME ] && . /etc/lava-dispatcher/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- --level $LOGLEVEL --master $MASTER_URL --socket-addr $LOGGER_URL $IPV6 $ENCRYPT $MASTER_CERT $SLAVE_CERT $HOSTNAME +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0) + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + restart|force-reload) + $0 stop + $0 start + ;; + try-restart) + $0 status >/dev/null 2>&1 && $0 restart + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|try-restart|status}" >&2 + exit 3 + ;; +esac + +: + diff --git a/lava-master/scripts/start.sh b/lava-master/scripts/start.sh index f4cc4eb..0e223b5 100755 --- a/lava-master/scripts/start.sh +++ b/lava-master/scripts/start.sh @@ -24,14 +24,14 @@ start () { #remove lava-pid files incase the image is stored without first stopping the services rm -f /var/run/lava-*.pid 2> /dev/null -start postgresql -start apache2 -start lava-server -start lava-master -start lava-coordinator -start lava-slave -start lava-server-gunicorn -start tftpd-hpa +/etc/init.d/postgresql start +start apache2 || exit $? +start lava-logs || exit $? +start lava-master || exit $? +start lava-coordinator || exit $? +start lava-slave || exit $? +start lava-server-gunicorn || exit $? +start tftpd-hpa || exit $? postgres-ready service apache2 reload #added after the website not running a few times on boot diff --git a/lava-master/scripts/stop.sh b/lava-master/scripts/stop.sh index ccf30fb..35d503f 100755 --- a/lava-master/scripts/stop.sh +++ b/lava-master/scripts/stop.sh @@ -2,9 +2,9 @@ service lava-master stop service lava-slave stop -service lava-server stop +service lava-logs stop service lava-coordinator stop service lava-server-gunicorn stop service apache2 stop -service postgresql stop +/etc/init.d/postgresql stop service tftpd-hpa stop diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index be2dbaa..b7252ef 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -34,7 +34,7 @@ RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y in #RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher COPY scripts/build-lava / -RUN sh /build-lava lava-dispatcher 2017.11 2017.11.post1-1 +RUN sh /build-lava lava-dispatcher 2018.4 2018.4-1 COPY configs/lava-slave /etc/lava-dispatcher/lava-slave @@ -44,8 +44,8 @@ COPY scripts/cu-loop /usr/local/bin/ COPY conmux/ /etc/conmux/ # Caution to not use any port between the Linux dynamic port range: 32768-60999 -RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py -RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py +RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python3/dist-packages/lava_dispatcher/utils/constants.py +RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python3/dist-packages/lava_dispatcher/utils/constants.py #conmux need cu >= 1.07-24 See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336996 RUN echo "deb http://debian.proxad.net/debian/ testing main" >> /etc/apt/sources.list.d/testing.list @@ -53,13 +53,16 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu RUN rm /etc/apt/sources.list.d/testing.list +COPY scripts/lava-slave /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-slave + # Add services helper utilities to start and stop LAVA COPY scripts/stop.sh . COPY scripts/start.sh . # lava-cli dependencies RUN apt-get -y install python3-setuptools python3-dev python3-zmq -RUN git clone https://git.linaro.org/lava/lavacli.git /root/lavacli && cd /root/lavacli && git checkout v0.6 && python3 setup.py install +RUN git clone https://git.linaro.org/lava/lavacli.git /root/lavacli && cd /root/lavacli && git checkout v0.7 && python3 setup.py install COPY phyhostname /root/ COPY scripts/setup.sh . diff --git a/lava-slave/scripts/lava-slave b/lava-slave/scripts/lava-slave new file mode 100644 index 0000000..3ba00f7 --- /dev/null +++ b/lava-slave/scripts/lava-slave @@ -0,0 +1,98 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lava-slave +# Required-Start: $time +# Required-Stop: $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: lava-slave +# Description: lava-slave +### END INIT INFO + +# +# Author: Corentin LABBE +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="lava-slave" +NAME=lava-slave + +DAEMON=/usr/bin/lava-slave +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +MASTER_URL=tcp://localhost:5556 +LOGGER_URL=tcp://localhost:5555 +LOGLEVEL=DEBUG + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME +[ -r /etc/lava-dispatcher/$NAME ] && . /etc/lava-dispatcher/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- --level $LOGLEVEL --master $MASTER_URL --socket-addr $LOGGER_URL $IPV6 $ENCRYPT $MASTER_CERT $SLAVE_CERT $HOSTNAME +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0) + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + restart|force-reload) + $0 stop + $0 start + ;; + try-restart) + $0 status >/dev/null 2>&1 && $0 restart + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|try-restart|status}" >&2 + exit 3 + ;; +esac + +: + -- cgit 1.2.3-korg