8460: Merge branch 'master' into 8460-websocket-go

diff --combined build/run-build-packages.sh
index 08b2cd204a0046defb3db95741639bd28042008b,0f10d26a9de37049c5a4ef7f1e1aed99e41db037..f5773e7a959a966fc18e9a8b4671218b1714b8cb
--- 1/build/run-build-packages.sh
--- 2/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@@ -424,8 -424,6 +424,6 @@@ package_go_binary services/crunch-run c
      "Supervise a single Crunch container"
  package_go_binary services/crunchstat crunchstat \
      "Gather cpu/memory/network statistics of running Crunch jobs"
- package_go_binary services/datamanager arvados-data-manager \
-     "Ensure block replication levels, report disk usage, and determine which blocks should be deleted when space is needed"
  package_go_binary services/keep-balance keep-balance \
      "Rebalance and garbage-collect data blocks stored in Arvados Keep"
  package_go_binary services/keepproxy keepproxy \
@@@ -434,8 -432,6 +432,8 @@@ package_go_binary services/keepstore ke
      "Keep storage daemon, accessible to clients on the LAN"
  package_go_binary services/keep-web keep-web \
      "Static web hosting service for user data stored in Arvados Keep"
 +package_go_binary services/ws arvados-ws \
 +    "Arvados Websocket server"
  package_go_binary tools/keep-block-check keep-block-check \
      "Verify that all data from one set of Keep servers to another was copied"
  package_go_binary tools/keep-rsync keep-rsync \
@@@ -452,7 -448,7 +450,7 @@@ package_go_binary tools/keep-exercise k
  # 2014-05-15
  cd $WORKSPACE/packages/$TARGET
  rm -rf "$WORKSPACE/sdk/python/build"
- fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --deb-recommends=git
+ fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --deb-recommends=git
  
  # cwl-runner
  cd $WORKSPACE/packages/$TARGET
@@@ -505,12 -501,12 +503,12 @@@ f
  # not omit the python- prefix first.
  cd $WORKSPACE/packages/$TARGET
  rm -rf "$WORKSPACE/services/fuse/build"
- fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver"
+ fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver" --depends "${PYTHON2_PKG_PREFIX}-setuptools"
  
  # The node manager
  cd $WORKSPACE/packages/$TARGET
  rm -rf "$WORKSPACE/services/nodemanager/build"
- fpm_build $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager"
+ fpm_build $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager" --depends "${PYTHON2_PKG_PREFIX}-setuptools"
  
  # The Docker image cleaner
  cd $WORKSPACE/packages/$TARGET

diff --combined build/run-tests.sh
index efcab595791f6f6f0db88eb23d4445524ca073eb,560a6933e8afe63e48f963dfa8c990a2da2b9897..e0e1ce28524327851e6925d26284530ced1dd5a0
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -79,7 -79,6 +79,7 @@@ services/nodemanage
  services/crunch-run
  services/crunch-dispatch-local
  services/crunch-dispatch-slurm
 +services/ws
  sdk/cli
  sdk/pam
  sdk/python
@@@ -91,7 -90,6 +91,7 @@@ sdk/go/httpserve
  sdk/go/manifest
  sdk/go/blockdigest
  sdk/go/streamer
 +sdk/go/stats
  sdk/go/crunchrunner
  sdk/cwl
  tools/crunchstat-summary
@@@ -272,18 -270,15 +272,18 @@@ start_api() 
          && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
          && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
          && export ARVADOS_TEST_API_INSTALLED="$$" \
 +        && python sdk/python/tests/run_test_server.py start_ws \
 +        && python sdk/python/tests/run_test_server.py start_nginx \
          && (env | egrep ^ARVADOS)
  }
  
  start_nginx_proxy_services() {
 -    echo 'Starting keepproxy, keep-web, arv-git-httpd, and nginx ssl proxy...'
 +    echo 'Starting keepproxy, keep-web, ws, arv-git-httpd, and nginx ssl proxy...'
      cd "$WORKSPACE" \
          && python sdk/python/tests/run_test_server.py start_keep_proxy \
          && python sdk/python/tests/run_test_server.py start_keep-web \
          && python sdk/python/tests/run_test_server.py start_arv-git-httpd \
 +        && python sdk/python/tests/run_test_server.py start_ws \
          && python sdk/python/tests/run_test_server.py start_nginx \
          && export ARVADOS_TEST_PROXY_SERVICES=1
  }
@@@ -294,15 -289,12 +294,15 @@@ stop_services() 
          cd "$WORKSPACE" \
              && python sdk/python/tests/run_test_server.py stop_nginx \
              && python sdk/python/tests/run_test_server.py stop_arv-git-httpd \
 +            && python sdk/python/tests/run_test_server.py stop_ws \
              && python sdk/python/tests/run_test_server.py stop_keep-web \
              && python sdk/python/tests/run_test_server.py stop_keep_proxy
      fi
      if [[ -n "$ARVADOS_TEST_API_HOST" ]]; then
          unset ARVADOS_TEST_API_HOST
          cd "$WORKSPACE" \
 +            && python sdk/python/tests/run_test_server.py stop_nginx \
 +            && python sdk/python/tests/run_test_server.py stop_ws \
              && python sdk/python/tests/run_test_server.py stop
      fi
  }
@@@ -764,7 -756,6 +764,7 @@@ gostuff=
      sdk/go/manifest
      sdk/go/streamer
      sdk/go/crunchrunner
 +    sdk/go/stats
      lib/crunchstat
      services/arv-git-httpd
      services/crunchstat
@@@ -773,14 -764,9 +773,10 @@@
      sdk/go/keepclient
      services/keep-balance
      services/keepproxy
-     services/datamanager/summary
-     services/datamanager/collection
-     services/datamanager/keep
-     services/datamanager
      services/crunch-dispatch-local
      services/crunch-dispatch-slurm
      services/crunch-run
 +    services/ws
      tools/keep-block-check
      tools/keep-exercise
      tools/keep-rsync