X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/99c4b804af44311d95e0b0ab72521471a1166347..22928daa55bc0de7d539793ff27503affac8a39a:/sdk/python/tests/run_test_server.py?ds=sidebyside diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py index 02f65e6caf..d90d2ad1a7 100644 --- a/sdk/python/tests/run_test_server.py +++ b/sdk/python/tests/run_test_server.py @@ -115,6 +115,33 @@ def find_available_port(): sock.close() return port +def _wait_until_port_listens(port, timeout=10): + """Wait for a process to start listening on the given port. + + If nothing listens on the port within the specified timeout (given + in seconds), print a warning on stderr before returning. + """ + try: + subprocess.check_output(['which', 'lsof']) + except subprocess.CalledProcessError: + print("WARNING: No `lsof` -- cannot wait for port to listen. "+ + "Sleeping 0.5 and hoping for the best.") + time.sleep(0.5) + return + deadline = time.time() + timeout + while time.time() < deadline: + try: + subprocess.check_output( + ['lsof', '-t', '-i', 'tcp:'+str(port)]) + except subprocess.CalledProcessError: + time.sleep(0.1) + continue + return + print( + "WARNING: Nothing is listening on port {} (waited {} seconds).". + format(port, timeout), + file=sys.stderr) + def run(leave_running_atexit=False): """Ensure an API server is running, and ARVADOS_API_* env vars have admin credentials for it. @@ -224,8 +251,10 @@ def run(leave_running_atexit=False): my_api_host = match.group(1) os.environ['ARVADOS_API_HOST'] = my_api_host - # Make sure the server has written its pid file before continuing + # Make sure the server has written its pid file and started + # listening on its TCP port find_server_pid(pid_file) + _wait_until_port_listens(port) reset() os.chdir(restore_cwd) @@ -281,38 +310,47 @@ def _start_keep(n, keep_args): for arg, val in keep_args.iteritems(): keep_cmd.append("{}={}".format(arg, val)) + logf = open(os.path.join(TEST_TMPDIR, 'keep{}.log'.format(n)), 'a+') kp0 = subprocess.Popen( - keep_cmd, stdin=open('/dev/null'), stdout=sys.stderr) + keep_cmd, stdin=open('/dev/null'), stdout=logf, stderr=logf, close_fds=True) with open(_pidfile('keep{}'.format(n)), 'w') as f: f.write(str(kp0.pid)) with open("{}/keep{}.volume".format(TEST_TMPDIR, n), 'w') as f: f.write(keep0) + _wait_until_port_listens(port) + return port -def run_keep(blob_signing_key=None, enforce_permissions=False): - stop_keep() +def run_keep(blob_signing_key=None, enforce_permissions=False, num_servers=2): + stop_keep(num_servers) keep_args = {} - if blob_signing_key: - with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f: - keep_args['--permission-key-file'] = f.name - f.write(blob_signing_key) + if not blob_signing_key: + blob_signing_key = 'zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc' + with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f: + keep_args['-blob-signing-key-file'] = f.name + f.write(blob_signing_key) if enforce_permissions: - keep_args['--enforce-permissions'] = 'true' + keep_args['-enforce-permissions'] = 'true' + with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f: + keep_args['-data-manager-token-file'] = f.name + f.write(os.environ['ARVADOS_API_TOKEN']) + keep_args['-never-delete'] = 'false' api = arvados.api( version='v1', host=os.environ['ARVADOS_API_HOST'], token=os.environ['ARVADOS_API_TOKEN'], insecure=True) + for d in api.keep_services().list().execute()['items']: api.keep_services().delete(uuid=d['uuid']).execute() for d in api.keep_disks().list().execute()['items']: api.keep_disks().delete(uuid=d['uuid']).execute() - for d in range(0, 2): + for d in range(0, num_servers): port = _start_keep(d, keep_args) svc = api.keep_services().create(body={'keep_service': { 'uuid': 'zzzzz-bi6l4-keepdisk{:07d}'.format(d), @@ -334,9 +372,9 @@ def _stop_keep(n): if os.path.exists(os.path.join(TEST_TMPDIR, "keep.blob_signing_key")): os.remove(os.path.join(TEST_TMPDIR, "keep.blob_signing_key")) -def stop_keep(): - _stop_keep(0) - _stop_keep(1) +def stop_keep(num_servers=2): + for n in range(0, num_servers): + _stop_keep(n) def run_keep_proxy(): if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: @@ -369,6 +407,7 @@ def run_keep_proxy(): }}).execute() os.environ["ARVADOS_KEEP_PROXY"] = "http://localhost:{}".format(port) _setport('keepproxy', port) + _wait_until_port_listens(port) def stop_keep_proxy(): if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: @@ -392,6 +431,7 @@ def run_arv_git_httpd(): with open(_pidfile('arv-git-httpd'), 'w') as f: f.write(str(agh.pid)) _setport('arv-git-httpd', gitport) + _wait_until_port_listens(gitport) def stop_arv_git_httpd(): if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: @@ -556,6 +596,9 @@ if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument('action', type=str, help="one of {}".format(actions)) parser.add_argument('--auth', type=str, metavar='FIXTURE_NAME', help='Print authorization info for given api_client_authorizations fixture') + parser.add_argument('--num-keep-servers', metavar='int', type=int, default=2, help="Number of keep servers desired") + parser.add_argument('--keep-enforce-permissions', action="store_true", help="Enforce keep permissions") + args = parser.parse_args() if args.action not in actions: @@ -575,7 +618,7 @@ if __name__ == "__main__": elif args.action == 'stop': stop(force=('ARVADOS_TEST_API_HOST' not in os.environ)) elif args.action == 'start_keep': - run_keep() + run_keep(enforce_permissions=args.keep_enforce_permissions, num_servers=args.num_keep_servers) elif args.action == 'stop_keep': stop_keep() elif args.action == 'start_keep_proxy':