X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3fa4a2b6138e3e9e468dd885a743ca38f08f0755..85bd5f3272cfc8ba8e54f4f47ea9865d7de62779:/sdk/python/arvados/commands/keepdocker.py diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py index 3ffb7f36b6..2c1ec738d1 100644 --- a/sdk/python/arvados/commands/keepdocker.py +++ b/sdk/python/arvados/commands/keepdocker.py @@ -1,5 +1,8 @@ -#!/usr/bin/env python +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 +from builtins import next import argparse import collections import datetime @@ -11,6 +14,7 @@ import subprocess import sys import tarfile import tempfile +import shutil import _strptime from operator import itemgetter @@ -20,10 +24,17 @@ import arvados import arvados.util import arvados.commands._util as arv_cmd import arvados.commands.put as arv_put +from arvados.collection import CollectionReader import ciso8601 +import logging +import arvados.config from arvados._version import __version__ +logger = logging.getLogger('arvados.keepdocker') +logger.setLevel(logging.DEBUG if arvados.config.get('ARVADOS_DEBUG') + else logging.INFO) + EARLIEST_DATETIME = datetime.datetime(datetime.MINYEAR, 1, 1, 0, 0, 0) STAT_CACHE_ERRORS = (IOError, OSError, ValueError) @@ -90,7 +101,7 @@ def docker_image_format(image_hash): cmd = popen_docker(['inspect', '--format={{.Id}}', image_hash], stdout=subprocess.PIPE) try: - image_id = next(cmd.stdout).strip() + image_id = next(cmd.stdout).decode().strip() if image_id.startswith('sha256:'): return 'v2' elif ':' not in image_id: @@ -103,15 +114,15 @@ def docker_image_format(image_hash): def docker_image_compatible(api, image_hash): supported = api._rootDesc.get('dockerImageFormats', []) if not supported: - print >>sys.stderr, "arv-keepdocker: warning: server does not specify supported image formats (see docker_image_formats in server config). Continuing." - return True + logger.warning("server does not specify supported image formats (see docker_image_formats in server config).") + return False fmt = docker_image_format(image_hash) if fmt in supported: return True else: - print >>sys.stderr, "arv-keepdocker: image format is {!r} " \ - "but server supports only {!r}".format(fmt, supported) + logger.error("image format is {!r} " \ + "but server supports only {!r}".format(fmt, supported)) return False def docker_images(): @@ -307,7 +318,7 @@ def list_images_in_arv(api_client, num_retries, image_name=None, image_tag=None) # and add image listings for them, retaining the API server preference # sorting. images_start_size = len(images) - for collection_uuid, link in hash_link_map.iteritems(): + for collection_uuid, link in hash_link_map.items(): if not seen_image_names[collection_uuid]: images.append(_new_image_listing(link, link['name'])) if len(images) > images_start_size: @@ -330,62 +341,6 @@ def _uuid2pdh(api, uuid): select=['portable_data_hash'], ).execute()['items'][0]['portable_data_hash'] -_migration_link_class = 'docker_image_migration' -_migration_link_name = 'migrate_1.9_1.10' -def _migrate19_link(api, root_uuid, old_uuid, new_uuid): - old_pdh = _uuid2pdh(api, old_uuid) - new_pdh = _uuid2pdh(api, new_uuid) - if not api.links().list(filters=[ - ['owner_uuid', '=', root_uuid], - ['link_class', '=', _migration_link_class], - ['name', '=', _migration_link_name], - ['tail_uuid', '=', old_pdh], - ['head_uuid', '=', new_pdh]]).execute()['items']: - print >>sys.stderr, 'Creating migration link {} -> {}: '.format( - old_pdh, new_pdh), - link = api.links().create(body={ - 'owner_uuid': root_uuid, - 'link_class': _migration_link_class, - 'name': _migration_link_name, - 'tail_uuid': old_pdh, - 'head_uuid': new_pdh, - }).execute() - print >>sys.stderr, '{}'.format(link['uuid']) - return link - -def migrate19(): - api = arvados.api('v1') - user = api.users().current().execute() - if not user['is_admin']: - raise Exception("This command requires an admin token") - root_uuid = user['uuid'][:12] + '000000000000000' - new_image_uuids = {} - images = list_images_in_arv(api, 2) - is_new = lambda img: img['dockerhash'].startswith('sha256:') - - count_new = 0 - for uuid, img in images: - if not re.match(r'^[0-9a-f]{64}$', img["tag"]): - continue - key = (img["repo"], img["tag"]) - if is_new(img) and key not in new_image_uuids: - count_new += 1 - new_image_uuids[key] = uuid - - count_migrations = 0 - new_links = [] - for uuid, img in images: - key = (img['repo'], img['tag']) - if not is_new(img) and key in new_image_uuids: - count_migrations += 1 - link = _migrate19_link(api, root_uuid, uuid, new_image_uuids[key]) - if link: - new_links.append(link) - - print >>sys.stderr, "=== {} new-format images, {} migrations detected, " \ - "{} links added.".format(count_new, count_migrations, len(new_links)) - return new_links - def main(arguments=None, stdout=sys.stdout): args = arg_parser.parse_args(arguments) api = arvados.api('v1') @@ -393,8 +348,14 @@ def main(arguments=None, stdout=sys.stdout): if args.image is None or args.image == 'images': fmt = "{:30} {:10} {:12} {:29} {:20}\n" stdout.write(fmt.format("REPOSITORY", "TAG", "IMAGE ID", "COLLECTION", "CREATED")) - for i, j in list_images_in_arv(api, args.retries): - stdout.write(fmt.format(j["repo"], j["tag"], j["dockerhash"][0:12], i, j["timestamp"].strftime("%c"))) + try: + for i, j in list_images_in_arv(api, args.retries): + stdout.write(fmt.format(j["repo"], j["tag"], j["dockerhash"][0:12], i, j["timestamp"].strftime("%c"))) + except IOError as e: + if e.errno == errno.EPIPE: + pass + else: + raise sys.exit(0) # Pull the image if requested, unless the image is specified as a hash @@ -405,15 +366,15 @@ def main(arguments=None, stdout=sys.stdout): try: image_hash = find_one_image_hash(args.image, args.tag) except DockerError as error: - print >>sys.stderr, "arv-keepdocker:", error.message + logger.error(error.message) sys.exit(1) if not docker_image_compatible(api, image_hash): if args.force_image_format: - print >>sys.stderr, "arv-keepdocker: forcing incompatible image" + logger.warning("forcing incompatible image") else: - print >>sys.stderr, "arv-keepdocker: refusing to store " \ - "incompatible format (use --force-image-format to override)" + logger.error("refusing to store " \ + "incompatible format (use --force-image-format to override)") sys.exit(1) image_repo_tag = '{}:{}'.format(args.image, args.tag) if not image_hash.startswith(args.image.lower()) else None @@ -455,7 +416,7 @@ def main(arguments=None, stdout=sys.stdout): api, args.retries, filters=[['link_class', '=', 'docker_image_repo+tag'], ['name', '=', image_repo_tag], - ['head_uuid', 'in', collections]]) + ['head_uuid', 'in', [c["uuid"] for c in collections]]]) else: existing_repo_tag = []