Fix opqaue whiteout handling in flattener.

client/v2_2/docker_image_.py

@@ -798,18 +798,19 @@ def __exit__(self, unused_type, unused_value, unused_traceback):
  pass
 
 
-def _in_whiteout_dir(fs, name):
+def _in_whiteout_dir(fs, opaque_whiteouts, name):
  while name:
  dirname = os.path.dirname(name)
  if name == dirname:
  break
- if fs.get(dirname):
+ if fs.get(dirname) or dirname in opaque_whiteouts:
  return True
  name = dirname
  return False
 
 
 _WHITEOUT_PREFIX = '.wh.'
+_OPAQUE_WHITEOUT_FILENAME = '.wh..wh..opq'
 
 
 def extract(image, tar):
@@ -823,17 +824,24 @@ def extract(image, tar):
  # to whether they are a tombstone or not.
  fs = {}
 
+ opaque_whiteouts_in_higher_layers = set()
+
  # Walk the layers, topmost first and add files. If we've seen them in a
  # higher layer then we skip them
  for layer in image.diff_ids():
  buf = io.BytesIO(image.uncompressed_layer(layer))
  with tarfile.open(mode='r:', fileobj=buf) as layer_tar:
+ opaque_whiteouts_in_this_layer = []
  for tarinfo in layer_tar:
  # If we see a whiteout file, then don't add anything to the tarball
  # but ensure that any lower layers don't add a file with the whited
  # out name.
  basename = os.path.basename(tarinfo.name)
  dirname = os.path.dirname(tarinfo.name)
+
+ if basename == _OPAQUE_WHITEOUT_FILENAME:
+ opaque_whiteouts_in_this_layer.append(dirname)
+
  tombstone = basename.startswith(_WHITEOUT_PREFIX)
  if tombstone:
  basename = basename[len(_WHITEOUT_PREFIX):]
@@ -845,7 +853,7 @@ def extract(image, tar):
  continue
 
  # Check for a whited out parent directory
- if _in_whiteout_dir(fs, name):
+ if _in_whiteout_dir(fs, opaque_whiteouts_in_higher_layers, name):
  continue
 
  # Mark this file as handled by adding its name.
@@ -857,3 +865,4 @@ def extract(image, tar):
  tar.addfile(tarinfo, fileobj=layer_tar.extractfile(tarinfo))
  else:
  tar.addfile(tarinfo, fileobj=None)
+ opaque_whiteouts_in_higher_layers.update(opaque_whiteouts_in_this_layer)