Merge branch '15397-remove-obsolete-apis'

[arvados.git] / sdk / python / arvados / commands / migrate19.py

diff --git a/sdk/python/arvados/commands/migrate19.py b/sdk/python/arvados/commands/migrate19.py
index 91899e67fc2bc6b3617fed0084c3ca7b5585ffc3..7bcc784fd755be1a20a324d5afe099fd0d1213a0 100644 (file)
--- a/sdk/python/arvados/commands/migrate19.py
+++ b/sdk/python/arvados/commands/migrate19.py
@@ -1,5 +1,7 @@
-from __future__ import print_function
-from __future__ import division
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import argparse
 import time
 import sys
@@ -14,6 +16,7 @@ import arvados
 import arvados.commands.keepdocker
 from arvados._version import __version__
 from arvados.collection import CollectionReader
+from .. import util
 
 logger = logging.getLogger('arvados.migrate-docker19')
 logger.setLevel(logging.DEBUG if arvados.config.get('ARVADOS_DEBUG')
@@ -25,6 +28,7 @@ _migration_link_name = 'migrate_1.9_1.10'
 class MigrationFailed(Exception):
     pass
 
+@util._deprecated('3.0')
 def main(arguments=None):
     """Docker image format migration tool for Arvados.
 
@@ -112,18 +116,23 @@ def main(arguments=None):
         key = (img["repo"], img["tag"], img["timestamp"])
         old_images.append(img)
 
-    migration_links = arvados.util.list_all(api_client.links().list, filters=[
-        ['link_class', '=', _migration_link_class],
-        ['name', '=', _migration_link_name],
-    ])
+    migration_links = arvados.util.keyset_list_all(
+        api_client.links().list,
+        filters=[
+            ['link_class', '=', _migration_link_class],
+            ['name', '=', _migration_link_name],
+        ],
+        order='uuid')
 
     already_migrated = set()
     for m in migration_links:
         already_migrated.add(m["tail_uuid"])
 
-    items = arvados.util.list_all(api_client.collections().list,
-                                  filters=[["uuid", "in", [img["collection"] for img in old_images]]],
-                                  select=["uuid", "portable_data_hash", "manifest_text", "owner_uuid"])
+    items = arvados.util.keyset_list_all(
+        api_client.collections().list,
+        filters=[["uuid", "in", [img["collection"] for img in old_images]]],
+        select=["uuid", "portable_data_hash", "manifest_text", "owner_uuid"],
+        order='uuid')
     uuid_to_collection = {i["uuid"]: i for i in items}
 
     need_migrate = {}
@@ -164,7 +173,7 @@ def main(arguments=None):
     ln = df_out.splitlines()[1]
     filesystem, blocks, used, available, use_pct, mounted = re.match(r"^([^ ]+) *([^ ]+) *([^ ]+) *([^ ]+) *([^ ]+) *([^ ]+)", ln).groups(1)
     if int(available) <= will_need:
-        logger.warn("Temp filesystem mounted at %s does not have enough space for biggest image (has %i MiB, needs %i MiB)", mounted, int(available)>>20, will_need>>20)
+        logger.warn("Temp filesystem mounted at %s does not have enough space for biggest image (has %i MiB, needs %i MiB)", mounted, int(available)>>20, int(will_need)>>20)
         if not args.force:
             exit(1)
         else: