Skip to content

Commit b6bc817

Browse files
Yikunkiwik
Yikun
authored and
kiwik
committed
Upstream sync (#2)
* Add tcp service for grpc listeners Signed-off-by: Michael Crosby <[email protected]> * Set nofile to 1048576 Closes containerd#3201 Signed-off-by: Michael Crosby <[email protected]> * Fix API forward events for shims Signed-off-by: Michael Crosby <[email protected]> * Add support for required plugins. Signed-off-by: Lantao Liu <[email protected]> * Use $TEST_RUNTIME for cri test. Signed-off-by: Lantao Liu <[email protected]> * Improve shim shutdown logic Shims no longer call `os.Exit` but close the context on shutdown so that events and other resources have hit the `defer`s. Signed-off-by: Michael Crosby <[email protected]> * Add dialer for events service Signed-off-by: Michael Crosby <[email protected]> * Rename `hrpc` to `tcpServer` Signed-off-by: Michael Crosby <[email protected]> * Check task list to avoid unnecessary cleanup. Signed-off-by: Lantao Liu <[email protected]> * Correct import path in services/server package Signed-off-by: Jared Cordasco <[email protected]> * Correct PusherFunc helper to match Pusher intf Signed-off-by: Jared Cordasco <[email protected]> * Requeue events in the shim publisher Signed-off-by: Michael Crosby <[email protected]> * bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb - mistifyio/go-zfs#72 Switch to google/uuid - removes the github.com/pborman/uuid dependency Signed-off-by: Sebastiaan van Stijn <[email protected]> * Update go-winio in vendor.conf Signed-off-by: Kevin Parsons <[email protected]> * Allow dumping stacks via ETW capture state Signed-off-by: Kevin Parsons <[email protected]> * Access to client's GRPC connection object Signed-off-by: Maksym Pavlenko <[email protected]> * .mailmap: update Akihiro Suda's email address No affiliation change (NTT). The former email address will continue to be available for the time being. For daily communication, I still prefer to use my gmail.com address. Signed-off-by: Akihiro Suda <[email protected]> * Move to sha-specified test image for nanoserver Signed-off-by: Phil Estes <[email protected]> * Fix error on pull hang in CI Kill the underlying containerd after outputting error. Otherwise CI hangs indefinitely and requires the CI infrastructure to kill the build at the timeout expiration. Signed-off-by: Wei Fu <[email protected]> Signed-off-by: Phil Estes <[email protected]> * Write stack dump to `os.TempDir()` as well Signed-off-by: John Howard <[email protected]> * bump gocapability full diff: syndtr/gocapability@db04d3c...d983527 changes included: - syndtr/gocapability#14 capability: Deprecate NewPid and NewFile for NewPid2 and NewFile2 - syndtr/gocapability#16 Fix capHeader.pid type Signed-off-by: Sebastiaan van Stijn <[email protected]> * Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3 full diff: golang/crypto@4979611...88737f5 Signed-off-by: Sebastiaan van Stijn <[email protected]> * bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f Signed-off-by: Sebastiaan van Stijn <[email protected]> * Convert Windows CI to use Microsoft MCR image urls Signed-off-by: Justin Terry (VM) <[email protected]> * Don't write dumped stacks to file for ETW capture state Signed-off-by: Kevin Parsons <[email protected]>
1 parent 1d3ac17 commit b6bc817

Some content is hidden

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

68 files changed

+1535
-1221
lines changed

‎.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Abhinandan Prativadi <[email protected]> Abhinandan Prativadi <[email protected]>
22
Abhinandan Prativadi <[email protected]> abhi <[email protected]>
3-
Akihiro Suda <[email protected]> Akihiro Suda <[email protected]>
3+
Akihiro Suda <[email protected]> Akihiro Suda <[email protected]>
4+
Akihiro Suda <[email protected]> Akihiro Suda <[email protected]>
45
Andrei Vagin <[email protected]> Andrei Vagin <[email protected]>
56
Brent Baude <[email protected]> baude <[email protected]>
67
Frank Yang <[email protected]> frank yang <[email protected]>

‎.travis.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,21 @@ script:
7474
- if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration ; fi
7575
# Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
7676
- if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
77-
- if [ "$GOOS" = "linux" ]; then
77+
- |
78+
if [ "$GOOS" = "linux" ]; then
79+
sudo mkdir -p /etc/containerd
80+
sudo bash -c "cat > /etc/containerd/config.toml <<EOF
81+
[plugins.cri.containerd.default_runtime]
82+
runtime_type = \"${TEST_RUNTIME}\"
83+
EOF"
7884
sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
79-
sudo ctr version ;
80-
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
81-
TEST_RC=$? ;
82-
test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log ;
83-
sudo pkill containerd ;
84-
test $TEST_RC -eq 0 || /bin/false ;
85+
sudo ctr version
86+
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8
87+
TEST_RC=$?
88+
test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log
89+
sudo pkill containerd
90+
sudo rm -rf /etc/containerd
91+
test $TEST_RC -eq 0 || /bin/false
8592
fi
8693
8794
after_success:

‎api/next.pb.txt

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4211,28 +4211,61 @@ file {
42114211
dependency: "google/protobuf/empty.proto"
42124212
dependency: "google/protobuf/timestamp.proto"
42134213
message_type {
4214-
name: "PublishRequest"
4214+
name: "ForwardRequest"
42154215
field {
4216-
name: "topic"
4216+
name: "envelope"
4217+
number: 1
4218+
label: LABEL_OPTIONAL
4219+
type: TYPE_MESSAGE
4220+
type_name: ".containerd.services.events.ttrpc.v1.Envelope"
4221+
json_name: "envelope"
4222+
}
4223+
}
4224+
message_type {
4225+
name: "Envelope"
4226+
field {
4227+
name: "timestamp"
42174228
number: 1
42184229
label: LABEL_OPTIONAL
4230+
type: TYPE_MESSAGE
4231+
type_name: ".google.protobuf.Timestamp"
4232+
options {
4233+
65001: 0
4234+
65010: 1
4235+
}
4236+
json_name: "timestamp"
4237+
}
4238+
field {
4239+
name: "namespace"
4240+
number: 2
4241+
label: LABEL_OPTIONAL
4242+
type: TYPE_STRING
4243+
json_name: "namespace"
4244+
}
4245+
field {
4246+
name: "topic"
4247+
number: 3
4248+
label: LABEL_OPTIONAL
42194249
type: TYPE_STRING
42204250
json_name: "topic"
42214251
}
42224252
field {
42234253
name: "event"
4224-
number: 2
4254+
number: 4
42254255
label: LABEL_OPTIONAL
42264256
type: TYPE_MESSAGE
42274257
type_name: ".google.protobuf.Any"
42284258
json_name: "event"
42294259
}
4260+
options {
4261+
64400: 1
4262+
}
42304263
}
42314264
service {
42324265
name: "Events"
42334266
method {
4234-
name: "Publish"
4235-
input_type: ".containerd.services.events.ttrpc.v1.PublishRequest"
4267+
name: "Forward"
4268+
input_type: ".containerd.services.events.ttrpc.v1.ForwardRequest"
42364269
output_type: ".google.protobuf.Empty"
42374270
}
42384271
}

0 commit comments

Comments
 (0)