Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit e5b175d

Browse files
Random-LiuRandom-Liu
authored
Merge pull request #931 from Random-Liu/cherrypick-#924-release-1.2
Cherrypick #924 release/1.2
2 parents 79645ed + dd67e74 commit e5b175d

144 files changed

Lines changed: 2372 additions & 728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/server/events.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,17 @@ const (
4242
backOffInitDuration = 1 * time.Second
4343
backOffMaxDuration = 5 * time.Minute
4444
backOffExpireCheckDuration = 1 * time.Second
45+
46+
// handleEventTimeout is the timeout for handling 1 event. Event monitor
47+
// handles events in serial, if one event blocks the event monitor, no
48+
// other events can be handled.
49+
// Add a timeout for each event handling, events that timeout will be requeued and
50+
// handled again in the future.
51+
handleEventTimeout = 10 * time.Second
4552
)
4653

4754
// eventMonitor monitors containerd event and updates internal state correspondingly.
48-
// TODO(random-liu): [P1] Figure out is it possible to drop event during containerd
49-
// is running. If it is, we should do periodically list to sync state with containerd.
55+
// TODO(random-liu): Handle event for each container in a separate goroutine.
5056
type eventMonitor struct {
5157
containerStore *containerstore.Store
5258
sandboxStore *sandboxstore.Store
@@ -189,6 +195,9 @@ func (em *eventMonitor) stop() {
189195
// handleEvent handles a containerd event.
190196
func (em *eventMonitor) handleEvent(any interface{}) error {
191197
ctx := ctrdutil.NamespacedContext()
198+
ctx, cancel := context.WithTimeout(ctx, handleEventTimeout)
199+
defer cancel()
200+
192201
switch any.(type) {
193202
// If containerd-shim exits unexpectedly, there will be no corresponding event.
194203
// However, containerd could not retrieve container state in that case, so it's

‎pkg/server/restart.go‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,23 @@ func (c *criService) recover(ctx context.Context) error {
136136
return nil
137137
}
138138

139+
// loadContainerTimeout is the default timeout for loading a container/sandbox.
140+
// One container/sandbox hangs (e.g. containerd#2438) should not affect other
141+
// containers/sandboxes.
142+
// Most CRI container/sandbox related operations are per container, the ones
143+
// which handle multiple containers at a time are:
144+
// * ListPodSandboxes: Don't talk with containerd services.
145+
// * ListContainers: Don't talk with containerd services.
146+
// * ListContainerStats: Not in critical code path, a default timeout will
147+
// be applied at CRI level.
148+
// * Recovery logic: We should set a time for each container/sandbox recovery.
149+
// * Event montior: We should set a timeout for each container/sandbox event handling.
150+
const loadContainerTimeout = 10 * time.Second
151+
139152
// loadContainer loads container from containerd and status checkpoint.
140153
func (c *criService) loadContainer(ctx context.Context, cntr containerd.Container) (containerstore.Container, error) {
154+
ctx, cancel := context.WithTimeout(ctx, loadContainerTimeout)
155+
defer cancel()
141156
id := cntr.ID()
142157
containerDir := c.getContainerRootDir(id)
143158
volatileContainerDir := c.getVolatileContainerRootDir(id)
@@ -290,16 +305,18 @@ const (
290305
// unknownContainerStatus returns the default container status when its status is unknown.
291306
func unknownContainerStatus() containerstore.Status {
292307
return containerstore.Status{
293-
CreatedAt: time.Now().UnixNano(),
294-
StartedAt: time.Now().UnixNano(),
295-
FinishedAt: time.Now().UnixNano(),
308+
CreatedAt: 0,
309+
StartedAt: 0,
310+
FinishedAt: 0,
296311
ExitCode: unknownExitCode,
297312
Reason: unknownExitReason,
298313
}
299314
}
300315

301316
// loadSandbox loads sandbox from containerd.
302317
func loadSandbox(ctx context.Context, cntr containerd.Container) (sandboxstore.Sandbox, error) {
318+
ctx, cancel := context.WithTimeout(ctx, loadContainerTimeout)
319+
defer cancel()
303320
var sandbox sandboxstore.Sandbox
304321
// Load sandbox metadata.
305322
exts, err := cntr.Extensions(ctx)

‎pkg/store/image/fake_image.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func NewFakeStore(images []Image) (*Store, error) {
2727
s.refCache[ref] = i.ID
2828
}
2929
if err := s.store.add(i); err != nil {
30-
return nil, errors.Wrapf(err, "add image %q", i)
30+
return nil, errors.Wrapf(err, "add image %+v", i)
3131
}
3232
}
3333
return s, nil

‎vendor.conf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
22
github.com/blang/semver v3.1.0
3-
github.com/boltdb/bolt v1.3.1
43
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
54
github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2
65
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
7-
github.com/containerd/containerd 1950f791d9225ffe061c77e74e292bcb3c428a04
8-
github.com/containerd/continuity f44b615e492bdfb371aae2f76ec694d9da1db537
6+
github.com/containerd/containerd f88d3e5d6dfe9b7d7941ac5241649ad8240b9282
7+
github.com/containerd/continuity 7f53d412b9eb1cbf744c2063185d703a0ee34700
98
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
109
github.com/containerd/go-cni 6d7b509a054a3cb1c35ed1865d4fde2f0cb547cd
1110
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
12-
github.com/containerd/ttrpc 94dde388801693c54f88a6596f713b51a8b30b2d
11+
github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a
1312
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
1413
github.com/containernetworking/cni v0.6.0
1514
github.com/containernetworking/plugins v0.7.0
@@ -35,13 +34,13 @@ github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
3534
github.com/json-iterator/go 1.1.5
3635
github.com/matttproud/golang_protobuf_extensions v1.0.0
3736
github.com/Microsoft/go-winio v0.4.10
38-
github.com/Microsoft/hcsshim 44c060121b68e8bdc40b411beba551f3b4ee9e55
37+
github.com/Microsoft/hcsshim v0.7.4
3938
github.com/modern-go/concurrent 1.0.3
4039
github.com/modern-go/reflect2 1.0.1
4140
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
4241
github.com/opencontainers/image-spec v1.0.1
43-
github.com/opencontainers/runc 20aff4f0488c6d4b8df4d85b4f63f1f704c11abd
44-
github.com/opencontainers/runtime-spec d810dbc60d8c5aeeb3d054bd1132fab2121968ce
42+
github.com/opencontainers/runc 00dc70017d222b178a002ed30e9321b12647af2d
43+
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353
4544
github.com/opencontainers/runtime-tools v0.6.0
4645
github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
4746
github.com/pkg/errors v0.8.0
@@ -59,6 +58,7 @@ github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
5958
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
6059
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b
6160
github.com/xeipuuv/gojsonschema 1d523034197ff1f222f6429836dd36a2457a1874
61+
go.etcd.io/bbolt v1.3.1-etcd.8
6262
golang.org/x/crypto 49796115aa4b964c318aad4f3084fdb41e9aa067
6363
golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac
6464
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4

‎vendor/github.com/Microsoft/hcsshim/internal/guid/guid.go‎

Lines changed: 47 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/internal/hcs/process.go‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/internal/hcs/system.go‎

Lines changed: 43 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)