X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/51e79a3be745cfd37efc49471ae21a1d54662e7f..6d162bfdf0c3cbfc2d723ecff4153f85daa2d003:/docker/arvdock diff --git a/docker/arvdock b/docker/arvdock index 39605664ce..43a384ea49 100755 --- a/docker/arvdock +++ b/docker/arvdock @@ -1,19 +1,29 @@ #!/bin/bash -ENABLE_SSH=false DOCKER=`which docker.io` if [[ "$DOCKER" == "" ]]; then DOCKER=`which docker` fi +CURL=`which curl` + COMPUTE_COUNTER=0 +ARVADOS_DOMAIN=dev.arvados + function usage { echo >&2 - echo >&2 "usage: $0 (start|stop|restart|test) [options]" + echo >&2 "usage: $0 (start|stop|restart|reset|test) [options]" + echo >&2 + echo >&2 "start run new or restart stopped arvados containers" + echo >&2 "stop stop arvados containers" + echo >&2 "restart stop and then start arvados containers" + echo >&2 "reset stop and delete containers WARNING: this will delete the data inside Arvados!" + echo >&2 "test run tests" echo >&2 - echo >&2 "$0 start/stop/restart options:" + echo >&2 "$0 options:" + echo >&2 " -b[bridge], --bridge[=bridge] Docker bridge (default bridge docker0)" echo >&2 " -d[port], --doc[=port] Documentation server (default port 9898)" echo >&2 " -w[port], --workbench[=port] Workbench server (default port 9899)" echo >&2 " -s[port], --sso[=port] SSO server (default port 9901)" @@ -22,8 +32,9 @@ function usage { echo >&2 " -v, --vm Shell server" echo >&2 " -n, --nameserver Nameserver" echo >&2 " -k, --keep Keep servers" - echo >&2 " --ssh Enable SSH access to server containers" + echo >&2 " -p, --keepproxy Keepproxy server" echo >&2 " -h, --help Display this help and exit" + echo >&2 " --domain=dns.domain DNS domain used by containers (default dev.arvados)" echo >&2 echo >&2 " If no options are given, the action is applied to all servers." echo >&2 @@ -36,7 +47,16 @@ function ip_address { echo `$DOCKER inspect $container |grep IPAddress |cut -f4 -d\"` } +function bridge_ip_address { + local bridge_name=$1 + # FIXME: add a more robust check here. + # because ip command could be mising, multiple docker bridges could be there.. etc. + echo $(ip --oneline --family inet addr show dev "$bridge_name" | awk '{ print $4 }'| cut -d/ -f1 ) +} + function start_container { + bridge_ip=$(bridge_ip_address "$bridge") + local args="-d -i -t" if [[ "$1" != '' ]]; then local port="$1" @@ -45,19 +65,19 @@ function start_container { if [[ "$2" != '' ]]; then local name="$2" if [[ "$name" == "api_server" ]]; then - args="$args --dns=172.17.42.1 --dns-search=compute.dev.arvados --hostname api -P --name $name" + args="$args --dns=$bridge_ip --dns-search=compute.$ARVADOS_DOMAIN --hostname api -P --name $name" elif [[ "$name" == "compute" ]]; then name=$name$COMPUTE_COUNTER # We need --privileged because we run docker-inside-docker on the compute nodes - args="$args --dns=172.17.42.1 --dns-search=compute.dev.arvados --hostname compute$COMPUTE_COUNTER -P --privileged --name $name" + args="$args --dns=$bridge_ip --dns-search=compute.$ARVADOS_DOMAIN --hostname compute$COMPUTE_COUNTER -P --privileged --name $name" let COMPUTE_COUNTER=$(($COMPUTE_COUNTER + 1)) else - args="$args --dns=172.17.42.1 --dns-search=dev.arvados --hostname ${name#_server} --name $name" + args="$args --dns=$bridge_ip --dns-search=$ARVADOS_DOMAIN --hostname ${name#_server} --name $name" fi fi if [[ "$3" != '' ]]; then local volume="$3" - args="$args -v $volume" + args="$args --volumes-from $volume" fi if [[ "$4" != '' ]]; then local link="$4" @@ -65,82 +85,38 @@ function start_container { fi local image=$5 - if $ENABLE_SSH - then - args="$args -e ENABLE_SSH=$ENABLE_SSH" - fi - - `$DOCKER ps |grep -P "$name[^/]" -q` + `$DOCKER ps |grep -E "\b$name\b" -q` if [[ "$?" == "0" ]]; then echo "You have a running container with name $name -- skipping." return fi - # Remove any existing container by this name. - $DOCKER rm "$name" 2>/dev/null + echo "Starting container: $name" + `$DOCKER ps --all |grep -E "\b$name\b" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER start $name" + container=`$DOCKER start $name` + else + echo " $DOCKER run $args $image" + container=`$DOCKER run $args $image` + fi - echo "Starting container:" - #echo " $DOCKER run --dns=127.0.0.1 $args $image" - echo " $DOCKER run $args $image" - container=`$DOCKER run $args $image` if [ "$?" != "0" -o "$container" = "" ]; then echo "Unable to start container" exit 1 - fi - if [ "$name" == "compute" -o "$ENABLE_SSH" != "false" ]; - then - ip=$(ip_address $container ) - echo - echo "You can ssh into the container with:" - echo - echo " ssh root@$ip" - echo else echo "Started container: $container" fi - if [[ "$name" == "doc_server" ]]; then - echo - echo "*****************************************************************" - echo "You can access the Arvados documentation at http://localhost:${port%:*}" - echo "*****************************************************************" - echo - fi - - if [[ "$name" == "workbench_server" ]]; then - echo - echo "*****************************************************************" - echo "You can access the Arvados workbench at http://localhost:${port%:*}" - echo "*****************************************************************" - echo - fi - - } -declare -a keep_volumes - -# Initialize the global `keep_volumes' array. If any keep volumes -# already appear to exist (mounted volumes with a top-level "keep" -# directory), use them; create temporary volumes if necessary. -# +# Create a Docker data volume function make_keep_volumes () { - # Mount a keep volume if we don't already have one - for mountpoint in $(cut -d ' ' -f 2 /proc/mounts); do - if [[ -d "$mountpoint/keep" && "$mountpoint" != "/" ]]; then - keep_volumes+=($mountpoint) - fi - done - - # Create any keep volumes that do not yet exist. - while [ ${#keep_volumes[*]} -lt 2 ] - do - new_keep=$(mktemp -d) - echo >&2 "mounting 2G tmpfs keep volume in $new_keep" - sudo mount -t tmpfs -o size=2G tmpfs $new_keep - mkdir $new_keep/keep - keep_volumes+=($new_keep) - done + `$DOCKER ps --all |grep -E "\bkeep_data\b" -q` + if [[ "$?" == "0" ]]; then + return + fi + docker create -v /keep-data --name keep_data arvados/keep } function do_start { @@ -152,10 +128,13 @@ function do_start { local start_vm=false local start_nameserver=false local start_keep=false + local start_keepproxy=false + local bridge="docker0" + local # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). - local TEMP=`getopt -o d::s::a::cw::nkvh \ - --long doc::,sso::,api::,compute,workbench::,nameserver,keep,vm,help,ssh \ + local TEMP=`getopt -o d::s::b:a::cw::nkpvh \ + --long doc::,sso::,api::,bridge:,compute,workbench::,nameserver,keep,keepproxy,vm,help,domain:: \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -166,6 +145,11 @@ function do_start { while [ $# -ge 1 ] do case $1 in + -b | --bridge) + case "$2" in + *) start_bridge=$2; shift 2 ;; + esac + ;; -d | --doc) case "$2" in "") start_doc=9898; shift 2 ;; @@ -206,11 +190,15 @@ function do_start { start_keep=true shift ;; - --ssh) - # ENABLE_SSH is a global variable - ENABLE_SSH=true + -p | --keepproxy) + start_keepproxy=true shift ;; + --domain) + case "$2" in + *) ARVADOS_DOMAIN="$2"; shift 2 ;; + esac + ;; --) shift break @@ -230,46 +218,73 @@ function do_start { $start_workbench == false && $start_vm == false && $start_nameserver == false && - $start_keep == false ]] + $start_keep == false && + $start_keepproxy == false ]] then start_doc=9898 start_sso=9901 start_api=9900 start_compute=2 start_workbench=9899 - start_vm=true + #start_vm=true start_nameserver=true start_keep=true + start_keepproxy=true fi - if [[ $start_sso != false ]] + if [[ $start_nameserver != false ]] then - start_container "$start_sso:443" "sso_server" '' '' "arvados/sso" - fi + $DOCKER ps | grep skydns >/dev/null + need_skydns="$?" - if [[ $start_api != false ]] - then - start_container "$start_api:443" "api_server" '' "sso_server:sso" "arvados/api" - fi + $DOCKER ps | grep skydock >/dev/null + need_skydock="$?" + + if [[ "$need_skydns" != 0 || "$need_skydock" != 0 ]] + then + # skydns and skydock need to both be running before everything else. + # If they are not running we need to shut everything down and start + # over, otherwise DNS will be broken and the containers won't find each other. + do_stop + need_skydns=1 + need_skydock=1 + fi - if [[ $start_nameserver != false ]] - then # We rely on skydock and skydns for dns discovery between the slurm controller and compute nodes, # so make sure they are running $DOCKER ps | grep skydns >/dev/null - if [[ "$?" != "0" ]]; then + if [[ $need_skydns != "0" ]]; then + echo "Detecting bridge '$bridge' IP for crosbymichael/skydns" + bridge_ip=$(bridge_ip_address "$bridge") + echo "Starting crosbymichael/skydns container..." $DOCKER rm "skydns" 2>/dev/null - $DOCKER run -d -p 172.17.42.1:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados + echo $DOCKER run -d -p $bridge_ip:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados + $DOCKER run -d -p $bridge_ip:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados fi $DOCKER ps | grep skydock >/dev/null - if [[ "$?" != "0" ]]; then + if [[ "$need_skydock" != "0" ]]; then echo "Starting crosbymichael/skydock container..." $DOCKER rm "skydock" 2>/dev/null + echo $DOCKER run -d -v /var/run/docker.sock:/docker.sock --name skydock crosbymichael/skydock -ttl 30 -environment dev -s /docker.sock -domain arvados -name skydns $DOCKER run -d -v /var/run/docker.sock:/docker.sock --name skydock crosbymichael/skydock -ttl 30 -environment dev -s /docker.sock -domain arvados -name skydns fi fi + if [[ $start_sso != false ]] + then + start_container "$start_sso:443" "sso_server" '' '' "arvados/sso" + fi + + if [[ $start_api != false ]] + then + if [[ $start_sso != false ]]; then + start_container "$start_api:443" "api_server" '' "sso_server:sso" "arvados/api" + else + start_container "$start_api:443" "api_server" '' '' "arvados/api" + fi + fi + if [[ $start_compute != false ]] then for i in `seq 0 $(($start_compute - 1))`; do @@ -282,20 +297,23 @@ function do_start { # create `keep_volumes' array with a list of keep mount points # remove any stale metadata from those volumes before starting them make_keep_volumes - for v in ${keep_volumes[*]} - do - [ -f $v/keep/.metadata.yml ] && sudo rm $v/keep/.metadata.yml - done start_container "25107:25107" "keep_server_0" \ - "${keep_volumes[0]}:/keep-data" \ + "keep_data" \ "api_server:api" \ "arvados/keep" start_container "25108:25107" "keep_server_1" \ - "${keep_volumes[1]}:/keep-data" \ + "keep_data" \ "api_server:api" \ "arvados/keep" fi + if [[ $start_keepproxy != false ]] + then + start_container "9902:9100" "keepproxy_server" '' \ + "api_server:api" \ + "arvados/keepproxy" + fi + if [[ $start_doc != false ]] then start_container "$start_doc:80" "doc_server" '' '' "arvados/doc" @@ -308,18 +326,56 @@ function do_start { if [[ $start_workbench != false ]] then - start_container "$start_workbench:80" "workbench_server" '' "api_server:api" "arvados/workbench" + start_container "" "workbench_server" '' "" "arvados/workbench" fi if [[ $start_api != false ]] then - if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados + if [[ -f "api/generated/superuser_token" ]] then + if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados + then cat >$HOME/.config/arvados/settings.conf </dev/null 2>/dev/null ; do + echo "Waiting for Arvados to be ready." + sleep 1 + done + + `$DOCKER ps |grep -E "\bdoc_server\b" -q` + if [[ "$?" == "0" ]]; then + echo + echo "******************************************************************" + echo "You can access the Arvados documentation at http://doc.$ARVADOS_DOMAIN" + echo "******************************************************************" + echo + fi + + `$DOCKER ps |grep -E "\bworkbench_server\b" -q` + if [[ "$?" == "0" ]]; then + echo + echo "********************************************************************" + echo "You can access the Arvados workbench at http://workbench.$ARVADOS_DOMAIN" + echo "********************************************************************" + echo fi fi @@ -334,10 +390,11 @@ function do_stop { local stop_nameserver="" local stop_vm="" local stop_keep="" + local stop_keepproxy="" # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). - local TEMP=`getopt -o dsacwnkvh \ - --long doc,sso,api,compute,workbench,nameserver,keep,vm,help \ + local TEMP=`getopt -o dsacwnkpvh \ + --long doc,sso,api,compute,workbench,nameserver,keep,keepproxy,vm,help,domain:: \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -355,7 +412,7 @@ function do_stop { -a | --api) stop_api=api_server ; shift ;; -c | --compute) - stop_compute=`$DOCKER ps |grep -P "compute\d+" |grep -v api_server |cut -f1 -d ' '` ; shift ;; + stop_compute=`$DOCKER ps |grep -E "\bcompute[0-9]+\b" |grep -v api_server |cut -f1 -d ' '` ; shift ;; -w | --workbench) stop_workbench=workbench_server ; shift ;; -n | --nameserver ) @@ -364,6 +421,13 @@ function do_stop { stop_vm="shell" ; shift ;; -k | --keep ) stop_keep="keep_server_0 keep_server_1" ; shift ;; + -p | --keepproxy ) + stop_keep="keepproxy_server" ; shift ;; + --domain) + case "$2" in + *) ARVADOS_DOMAIN="$2"; shift 2 ;; + esac + ;; --) shift break @@ -383,19 +447,21 @@ function do_stop { $stop_workbench == "" && $stop_vm == "" && $stop_nameserver == "" && - $stop_keep == "" ]] + $stop_keep == "" && + $stop_keepproxy == "" ]] then stop_doc=doc_server stop_sso=sso_server stop_api=api_server - stop_compute=`$DOCKER ps |grep -P "compute\d+" |grep -v api_server |cut -f1 -d ' '` + stop_compute=`$DOCKER ps |grep -E "\bcompute[0-9]+\b" |grep -v api_server |cut -f1 -d ' '` stop_workbench=workbench_server stop_vm=shell stop_nameserver="skydock skydns" stop_keep="keep_server_0 keep_server_1" + stop_keepproxy="keepproxy_server" fi - $DOCKER stop $stop_doc $stop_sso $stop_api $stop_compute $stop_workbench $stop_nameserver $stop_keep $stop_vm \ + $DOCKER stop $stop_doc $stop_sso $stop_api $stop_compute $stop_workbench $stop_nameserver $stop_keep $stop_keepproxy $stop_vm \ 2>/dev/null } @@ -430,6 +496,34 @@ function do_test { done } +function do_reset { + for name in skydock skydns workbench_server shell doc_server keepproxy_server keep_server_0 keep_server_1 compute0 compute1 api_server keepproxy keep_data sso_server + do + `$DOCKER ps |grep -E "\b$name\b" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER stop $name" + $DOCKER stop $name + fi + `$DOCKER ps --all |grep -E "\b$name\b" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER rm $name" + $DOCKER rm $name + fi + done +} + +if [ "$DOCKER" == '' ] +then + echo "Docker not found. Please install it first." + exit 2 +fi + +if [ "$CURL" == '' ] +then + echo "Curl not found. Please install it first." + exit 3 +fi + if [ $# -lt 1 ] then usage @@ -454,6 +548,10 @@ case $1 in shift do_test $@ ;; + reset) + shift + do_reset $@ + ;; *) usage exit 1