[4/4] Upgrade GitLab to Amazon Linux 2023 (#6160)

Change resolve_container_path.py to work with new instance use of cgroup v2

Author: achave11-ucsc

scripts/resolve_container_path.py

@@ -1,3 +1,4 @@
+import csv
 import logging
 import os
 import sys
@@ -26,24 +27,31 @@
 
 def resolve_container_path(container_path):
     container_path = os.path.realpath(container_path)
-    proc_cgroup = '/proc/self/cgroup'
+    mountinfo = '/proc/self/mountinfo'
     try:
-        with open(proc_cgroup) as f:
-            log.info('Found %s', proc_cgroup)
-            # Entries in /proc/self/cgroup look like this (note the nesting):
-            # 11:name=systemd:/docker/82c1bd2…23b5bcf/docker/6547bce…60ca5a7
-            prefix, container_id = next(f).strip().split(':')[2].split('/')[-2:]
+        with open(mountinfo) as f:
+            log.info('Found %s', mountinfo)
+            # Entries in /proc/self/mountinfo look like this:
+            # 752 744 259:2 /docker/containers/dc61d93…ID…/hosts …
+            prefix = '/docker/containers'
+            contents = csv.reader(f, delimiter=' ')
+            for line in contents:
+                path = line[3]
+                if path.startswith(prefix):
+                    log.info('Extracting the container ID from %s', path)
+                    parts = path.rsplit('/', maxsplit=2)[:-1]
+                    assert len(parts) == 2 and parts[0] == prefix, parts
+                    container_id = parts[1]
     except FileNotFoundError:
         log.info('Did not find %s', proc_cgroup)
     else:
-        if prefix == 'docker':
-            api = docker.client.from_env().api
-            for mount in api.inspect_container(container_id)['Mounts']:
-                if container_path.startswith(mount['Destination']):
-                    tail = os.path.relpath(container_path, mount['Destination'])
-                    host_path = os.path.normpath(os.path.join(mount['Source'], tail))
-                    log.info('Resolved %s to %s', container_path, host_path)
-                    return host_path
+        api = docker.client.from_env().api
+        for mount in api.inspect_container(container_id)['Mounts']:
+            if container_path.startswith(mount['Destination']):
+                tail = os.path.relpath(container_path, mount['Destination'])
+                host_path = os.path.normpath(os.path.join(mount['Source'], tail))
+                log.info('Resolved %s to %s', container_path, host_path)
+                return host_path
     log.error('Failed to resolve container path %s', container_path)
     return None