refactor: eliminate containerMeta in daemon manager

[allencloud]

Signed-off-by: Allen Sun allensun.shl@alibaba-inc.com

Ⅰ. Describe what this PR did

In the ContainerMgr of original code, we have two structs which describe container instance, one is Container, and the other is ContainerMeta. While we have the following relationship between them:

type ContainerMeta struct {
    sync.Mutex
    *Container
    Detachkeys string
}

So, we can find that ContainerMeta has a very similar construction of Container. So we could only make use of Container to eliminate one to make code and data structure much more simplified.

Ⅱ. Does this pull request fix one issue?

none

Ⅲ. Describe how you did it

none

Ⅳ. Describe how to verify it

none

Ⅴ. Special notes for reviews

none

[allencloud]

With this PR, I think api image deletion test fails:

FAIL: /go/src/github.com/alibaba/pouch/test/api_image_delete_test.go:31: APIImageDeleteSuite.TestDeleteUsingImage
/go/src/github.com/alibaba/pouch/test/api_image_delete_test.go:38:
    CheckRespStatus(c, resp, 500)
/go/src/github.com/alibaba/pouch/test/util_api.go:21:
    c.Assert(resp.StatusCode, check.Equals, status, check.Commentf("Error:%s", got.Message))
... obtained int = 204
... expected int = 500
... Error:

I am wondering if this is related to the reference struct. Could you help to take a look at the failure? @fuweid Thanks a lot.

[fuweid]

Got it @allencloud

[allencloud]

It also reports panic error like:

PANIC: /go/src/github.com/alibaba/pouch/test/z_cli_daemon_test.go:229: PouchDaemonSuite.TestDaemonRestart
... Panic: runtime error: index out of range (PC=0x45AF0A)
/usr/local/go/src/runtime/panic.go:491
  in gopanic
/usr/local/go/src/runtime/panic.go:28
  in panicindex
/go/src/github.com/alibaba/pouch/test/z_cli_daemon_test.go:268
  in PouchDaemonSuite.TestDaemonRestart
/usr/local/go/src/reflect/value.go:302
  in Value.Call
/go/src/github.com/alibaba/pouch/vendor/github.com/go-check/check/check.go:772
  in suiteRunner.forkTest.func1
/go/src/github.com/alibaba/pouch/vendor/github.com/go-check/check/check.go:666
  in suiteRunner.forkCall.func1
/usr/local/go/src/runtime/asm_amd64.s:2337
  in goexit
----------------------------------------------------------------------
PANIC: /go/src/github.com/alibaba/pouch/test/z_cli_daemon_test.go:272: PouchDaemonSuite.TestDaemonRestartWithPausedContainer
... Panic: runtime error: index out of range (PC=0x45AF0A)
/usr/local/go/src/runtime/panic.go:491
  in gopanic
/usr/local/go/src/runtime/panic.go:28
  in panicindex
/go/src/github.com/alibaba/pouch/test/z_cli_daemon_test.go:316
  in PouchDaemonSuite.TestDaemonRestartWithPausedContainer
/usr/local/go/src/reflect/value.go:302
  in Value.Call
/go/src/github.com/alibaba/pouch/vendor/github.com/go-check/check/check.go:772
  in suiteRunner.forkTest.func1
/go/src/github.com/alibaba/pouch/vendor/github.com/go-check/check/check.go:666
  in suiteRunner.forkCall.func1
/usr/local/go/src/runtime/asm_amd64.s:2337
  in goexit

[codecov-io]

Codecov Report

Merging #1300 into master will increase coverage by 0.03%.
The diff coverage is 4.04%.

@@            Coverage Diff             @@
##           master    #1300      +/-   ##
==========================================
+ Coverage   16.42%   16.46%   +0.03%     
==========================================
  Files         182      182              
  Lines       11303    11277      -26     
==========================================
  Hits         1857     1857              
+ Misses       9310     9284      -26     
  Partials      136      136

Impacted Files	Coverage Δ
daemon/mgr/spec_linux.go	0% <0%> (ø)	⬆️
daemon/mgr/spec_process.go	0% <0%> (ø)	⬆️
daemon/mgr/cri.go	0% <0%> (ø)	⬆️
daemon/mgr/container.go	0% <0%> (ø)	⬆️
daemon/mgr/container_exec.go	0% <0%> (ø)	⬆️
daemon/mgr/spec_annotations.go	0% <0%> (ø)	⬆️
daemon/mgr/system.go	0% <0%> (ø)	⬆️
apis/server/image_bridge.go	15% <0%> (ø)	⬆️
daemon/mgr/spec_hook.go	0% <0%> (ø)	⬆️
apis/server/container_bridge.go	0% <0%> (ø)	⬆️
... and 9 more

[HusterWan]

types.Container and ContainerMgr.Container may be confused, can we named different to distinct this two containers struct ?

[allencloud]

Updated, PTAL @HusterWan

[HusterWan]

I have reviewed part of pouchd, LGTM . cri part need @YaoZengzeng to review

[YaoZengzeng]

Only name changing (ContainerMeta -> Container) in CRI side and the CI passed as well.

So LGTM.

[allencloud]

Thanks a lot for your review. @HusterWan @YaoZengzeng 🍻