Skip to content

Conversation

@LK4D4
Copy link
Contributor

@LK4D4 LK4D4 commented Dec 21, 2015

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this test is better as:

go func() {
  time.Sleep(1 * time.Second)
  s.Add(ch, "1")
  ch <- struct{}{}
}()
val := <-s.Chan()

Atm, if you don't know the internals you would not know if this was because adding while being blocked is supported or because only first call to s.Chan() generates the condition.

@LK4D4
Copy link
Contributor Author

LK4D4 commented Dec 22, 2015

@tonistiigi I changed test.

@tonistiigi
Copy link
Member

LGTM

LK4D4 added a commit that referenced this pull request Dec 22, 2015
Fix adding to chanotify on blocking select
@LK4D4 LK4D4 merged commit f51744f into containerd:master Dec 22, 2015
@LK4D4 LK4D4 deleted the fix_chan branch December 22, 2015 22:57
crosbymichael added a commit to crosbymichael/containerd that referenced this pull request Dec 10, 2018
```
1152b96 (HEAD -> master, origin/master)
Merge pull request containerd#73 from gliptak/gofmt1
afd5981 Gofmt cgroup_test
65ce98b Merge pull request containerd#69 from
cclerget/master-weight-pointer
0f372c6 Merge pull request containerd#71 from
JoeWrightss/patch-1
f48bd85 Fixs return error message
10cd53e Merge pull request containerd#70 from
gliptak/patch-1
64bade4 Take value instead of pointer
value
b49c471 Correct ineffassign warning
3bc6dde Merge pull request containerd#68 from
cclerget/master-net_prio-typo
6b552a8 Fix net_prio typo
c0437c3 Merge pull request containerd#67 from
gpanouts/get-all-cgroup-tasks
a31a0ff Add functionality for
retrieving all tasks of a cgroup
82cb49f Merge pull request containerd#63 from
ChrsMark/lenient-subsystems-checking
7d825b2 Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb4 Change Load function in order
to be more lenient on subsystems' checking
965bb1d Merge pull request containerd#66 from
crosbymichael/systemdci
ab9ec0e (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83 Merge pull request containerd#59 from
gliptak/patch-1
4479d11 Merge pull request containerd#62 from
estesp/fix-gofmt
9beb998 Merge pull request containerd#61 from
gliptak/patch-3
9a09e58 Fix gofmt of systemd.go
84e6e6e Merge pull request containerd#60 from
gliptak/patch-2
e13f6cc Add GoReportCard badge to
README
d124595 Add Go 1.11 to Travis
d961ab9 Correct typo
d240072 Merge pull request containerd#57 from
estesp/project-update
e4cf832 Add project references and use
common project travis
8baeff6 Merge pull request containerd#56 from
grantseltzer/patch-1
9de57ff Add godoc badge to README.md
5017d4e Merge pull request containerd#54 from
WeiZhang555/bugfix
13aaafd Bugfix: can't write to cpuset
cgroup
58556f5 Merge pull request containerd#53 from
baude/systemdslicedelegate
15ed73c systemd-239+ no longer allows
delegate slice
3024bc7 Merge pull request containerd#52 from
Sykomaniac/bugfix/slice-name
2596f33 Remove call to unitName
2e2922e Merge pull request containerd#51 from
containerd/type
0f3de2f (type) Fix empty device type
```

Signed-off-by: Michael Crosby <[email protected]>
robertgzr pushed a commit to balena-os/balena-containerd that referenced this pull request Mar 4, 2019
```
1152b96 (HEAD -> master, origin/master)
Merge pull request containerd#73 from gliptak/gofmt1
afd5981 Gofmt cgroup_test
65ce98b Merge pull request containerd#69 from
cclerget/master-weight-pointer
0f372c6 Merge pull request containerd#71 from
JoeWrightss/patch-1
f48bd85 Fixs return error message
10cd53e Merge pull request containerd#70 from
gliptak/patch-1
64bade4 Take value instead of pointer
value
b49c471 Correct ineffassign warning
3bc6dde Merge pull request containerd#68 from
cclerget/master-net_prio-typo
6b552a8 Fix net_prio typo
c0437c3 Merge pull request containerd#67 from
gpanouts/get-all-cgroup-tasks
a31a0ff Add functionality for
retrieving all tasks of a cgroup
82cb49f Merge pull request containerd#63 from
ChrsMark/lenient-subsystems-checking
7d825b2 Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb4 Change Load function in order
to be more lenient on subsystems' checking
965bb1d Merge pull request containerd#66 from
crosbymichael/systemdci
ab9ec0e (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83 Merge pull request containerd#59 from
gliptak/patch-1
4479d11 Merge pull request containerd#62 from
estesp/fix-gofmt
9beb998 Merge pull request containerd#61 from
gliptak/patch-3
9a09e58 Fix gofmt of systemd.go
84e6e6e Merge pull request containerd#60 from
gliptak/patch-2
e13f6cc Add GoReportCard badge to
README
d124595 Add Go 1.11 to Travis
d961ab9 Correct typo
d240072 Merge pull request containerd#57 from
estesp/project-update
e4cf832 Add project references and use
common project travis
8baeff6 Merge pull request containerd#56 from
grantseltzer/patch-1
9de57ff Add godoc badge to README.md
5017d4e Merge pull request containerd#54 from
WeiZhang555/bugfix
13aaafd Bugfix: can't write to cpuset
cgroup
58556f5 Merge pull request containerd#53 from
baude/systemdslicedelegate
15ed73c systemd-239+ no longer allows
delegate slice
3024bc7 Merge pull request containerd#52 from
Sykomaniac/bugfix/slice-name
2596f33 Remove call to unitName
2e2922e Merge pull request containerd#51 from
containerd/type
0f3de2f (type) Fix empty device type
```

Signed-off-by: Michael Crosby <[email protected]>
kevpar added a commit to kevpar/containerd that referenced this pull request Oct 26, 2020
containerd 1.4.1

Welcome to the v1.4.1 release of containerd!

The first patch release for `containerd` 1.4 includes a fix for v1 shims hanging
on exit and exec when the log pipe fills up along with other minor changes.

* Always consume shim logs to prevent logs in the shim from blocking [containerd#4546](containerd#4546)
* Fix error deleting v2 bundle directory when removing rootfs returns `ErrNotExist` [containerd#4472](containerd#4472)
* Fix metrics monitoring of v2 runtime tasks [containerd#4486](containerd#4486)
* Fix incorrect stat for Windows containers [containerd#4468](containerd#4468)
* Fix devmapper device deletion on rollback [containerd#4437](containerd#4437)
* Update seccomp default profile [containerd#4481](containerd#4481) [containerd#4491](containerd#4491) [containerd#4492](containerd#4492) [containerd#4493](containerd#4493)

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Sebastiaan van Stijn
* Derek McGowan
* Wei Fu
* Brian Goff
* Akihiro Suda
* Antonio Ojea
* Jintao Zhang
* Phil Estes
* Kazuyoshi Kato
* Li Yuxuan
* Mike Brown
* Prashant Bhutani
<details><summary>36 commits</summary>
<p>

* [`c623d1b3`](containerd@c623d1b) Merge pull request  [containerd#4564](containerd#4564) from dmcgowan/prepare-1.4.1
* [`97d690d2`](containerd@97d690d) Prepare v1.4.1 release
* [`910da2fb`](containerd@910da2f) Merge pull request  [containerd#4555](containerd#4555) from thaJeztah/1.4_backport_bumpcni
* [`ca3b91d8`](containerd@ca3b91d) Merge pull request  [containerd#4560](containerd#4560) from dmcgowan/backport-4546
* [`42f38718`](containerd@42f3871) Always consume shim logs
* [`ea29a60a`](containerd@ea29a60) Merge pull request  [containerd#4558](containerd#4558) from thaJeztah/1.4_backport_winstats
* [`db931948`](containerd@db93194) Merge pull request  [containerd#4557](containerd#4557) from thaJeztah/1.4_backport_makefile_test_tags
* [`9b5066aa`](containerd@9b5066a) Merge pull request  [containerd#4556](containerd#4556) from thaJeztah/1.4_backport_fix_static_plugin
* [`3bcce819`](containerd@3bcce81) Merge pull request  [containerd#4554](containerd#4554) from thaJeztah/1.4_backport_add_openat2_syscall
* [`98a733e0`](containerd@98a733e) Merge pull request  [containerd#4552](containerd#4552) from thaJeztah/1.4_backport_shim_exec_p_debug
* [`f247618a`](containerd@f247618) Report correct stats for windows containers
* [`cc5d1518`](containerd@cc5d151) Update go list to respect build tags
* [`086e859d`](containerd@086e859) BUILDING.md: fix description about static builds
* [`16712ae4`](containerd@16712ae) bump cni version to v0.8.0
* [`1575c88c`](containerd@1575c88) seccomp: add `faccessat2` syscall.
* [`8bd2bece`](containerd@8bd2bec) seccomp: add `openat2` syscall.
* [`4e3397e0`](containerd@4e3397e) shimv1: downgrade poroccess missing log to debug
* [`6b5fc7f2`](containerd@6b5fc7f) Merge pull request  [containerd#4542](containerd#4542) from thaJeztah/1.4_backport_forward_signal_not_found
* [`d118c90d`](containerd@d118c90) Ignore SIGURG signals in signal forwarder
* [`3ee6189f`](containerd@3ee6189) Exit signal forward if process not found
* [`1a367762`](containerd@1a36776) Merge pull request  [containerd#4512](containerd#4512) from fuweid/14-cherry-pick-4486
* [`a1289d6b`](containerd@a1289d6) tasks: Monitor v2 tasks in initFunc as well
* [`12f20c99`](containerd@12f20c9) Merge pull request  [containerd#4503](containerd#4503) from thaJeztah/1.4_backport_seccomp_updates
* [`1f823f76`](containerd@1f823f7) seccomp: allow io-uring related system calls
* [`3d28944b`](containerd@3d28944) seccomp: allow clock_settime when CAP_SYS_TIME is added
* [`e5cc7d52`](containerd@e5cc7d5) seccomp: allow quotactl with CAP_SYS_ADMIN
* [`20273a80`](containerd@20273a8) seccomp: allow sync_file_range2 on supported architectures.
* [`357d1002`](containerd@357d100) seccomp: allow personality with UNAME26 bit set
* [`0c9de662`](containerd@0c9de66) seccomp: allow syscall membarrier
* [`caa46116`](containerd@caa4611) seccomp: allow adjtimex get time operation
* [`2b80b7dc`](containerd@2b80b7d) seccomp: allow add preadv2 and pwritev2 syscalls
* [`e71eccbc`](containerd@e71eccb) seccomp: move the syslog syscall to be gated by CAP_SYS_ADMIN or CAP_SYSLOG
* [`881db9b5`](containerd@881db9b) Merge pull request  [containerd#4499](containerd#4499) from fuweid/cherry-pick-4472
* [`feff914a`](containerd@feff914) runtime: ignore ErrNotExist when remove rootfs
* [`94c8bd94`](containerd@94c8bd9) Merge pull request  [containerd#4496](containerd#4496) from kzys/backport-1.4-4437
* [`23e0ea27`](containerd@23e0ea2) snapshots/devmapper: fix rollback
</p>
</details>
<details><summary>4 commits</summary>
<p>

* [`8fbf363`](containerd/go-cni@8fbf363) Merge pull request  [containerd#56](containerd/go-cni#56) from aojea/bumpcni
* [`49657db`](containerd/go-cni@49657db) bump containernetworking/cni dependency to 0.8.0
* [`1582593`](containerd/go-cni@1582593) Merge pull request  [containerd#58](containerd/go-cni#58) from fuweid/update-readme-usage
* [`8ffba88`](containerd/go-cni@8ffba88) README.md: update Usage case
</p>
</details>

* **github.com/containerd/go-cni**            v1.0.0 -> v1.0.1
* **github.com/containernetworking/cni**      v0.7.1 -> v0.8.0
* **github.com/containernetworking/plugins**  v0.7.6 -> v0.8.6

Previous release can be found at [v1.4.0](https://github.com/containerd/containerd/releases/tag/v1.4.0)
jepio pushed a commit to jepio/containerd that referenced this pull request Dec 3, 2021
jseba pushed a commit to jseba/containerd that referenced this pull request Aug 25, 2023
Add a changelog note about the containerd changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants