--- FAIL: TestCheckpointRestoreNewContainer (5.65s)
    container_checkpoint_test.go:325: io.containerd.runc.v1: failed to listen to abstract unix socket "/containerd-shim/testing/TestCheckpointRestoreNewContainer/shim.sock": listen unix /containerd-shim/testing/TestCheckpointRestoreNewContainer/shim.sock: bind: address already in use

flaky case.

Codecov Report

Merging #3025 into master will not change coverage.
The diff coverage is 0%.

@@           Coverage Diff           @@
##           master    #3025   +/-   ##
=======================================
  Coverage   43.96%   43.96%           
=======================================
  Files         102      102           
  Lines       10881    10881           
=======================================
  Hits         4784     4784           
  Misses       5362     5362           
  Partials      735      735

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a378dbc...4b3e0a8. Read the comment docs.

LGTM

@fuweid @crosbymichael Hello, may I ask when this bug fix can be merged into releases 1.2?

@wangpeng168 It makes sense to me. :)

BTW, we don't have #3055 improvement in release/1.2, Do you have any problems without patches?

@fuweid #3055 This problem is not resolved #3025, and there is no conflict, why not backport to release/1.2?

@wangpeng168 sorry for misunderstanding. I am happy to do fix in current release. But I just want to know the scenario because the metadata doesn’t pass the option down to the snapshot plugin and the snapshot doesn’t have any labels basically.

I realize this code was not correct before. However, I am not sure this is how it should be fixed. The problem is that the backend really shouldn't be overwriting labels within the metadata store. In fact I am not sure this should really be overlaying the labels at all since the labels should flow to the backend, but we need to be careful of what the use case is of the backend adding non-user-set labels.

Read this backwards, it will not overwrite, but the backend could set labels not intended. I think maybe filtering the labels coming from the backend or always overwriting the whole map is reasonable.