Upstream sync (#2)

* Add tcp service for grpc listeners

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Set nofile to 1048576

Closes containerd#3201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Fix API forward events for shims

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Add support for required plugins.

Signed-off-by: Lantao Liu <lantaol@google.com>

* Use $TEST_RUNTIME for cri test.

Signed-off-by: Lantao Liu <lantaol@google.com>

* 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 <crosbymichael@gmail.com>

* Add dialer for events service

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Rename `hrpc` to `tcpServer`

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Check task list to avoid unnecessary cleanup.

Signed-off-by: Lantao Liu <lantaol@google.com>

* Correct import path in services/server package

Signed-off-by: Jared Cordasco <jcordasc@coglib.com>

* Correct PusherFunc helper to match Pusher intf

Signed-off-by: Jared Cordasco <jcordasc@coglib.com>

* Requeue events in the shim publisher

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* 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 <github@gone.nl>

* Update go-winio in vendor.conf

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>

* Allow dumping stacks via ETW capture state

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>

* Access to client's GRPC connection object

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>

* .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 <akihiro.suda.cz@hco.ntt.co.jp>

* Move to sha-specified test image for nanoserver

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

* 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 <fuweid89@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

* Write stack dump to `os.TempDir()` as well

Signed-off-by: John Howard <jhoward@microsoft.com>

* 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 <github@gone.nl>

* Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3

full diff: golang/crypto@4979611...88737f5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Convert Windows CI to use Microsoft MCR image urls

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>

* Don't write dumped stacks to file for ETW capture state

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>

.mailmap

@@ -1,6 +1,7 @@
 Abhinandan Prativadi <abhi@docker.com> Abhinandan Prativadi <aprativadi@gmail.com>
 Abhinandan Prativadi <abhi@docker.com> abhi <abhi@docker.com>
-Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 Andrei Vagin <avagin@virtuozzo.com> Andrei Vagin <avagin@openvz.org>
 Brent Baude <bbaude@redhat.com> baude <bbaude@redhat.com>
 Frank Yang <yyb196@gmail.com> frank yang <yyb196@gmail.com>

.travis.yml

@@ -74,14 +74,21 @@ script:
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration ; fi
   # Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
-  - if [ "$GOOS" = "linux" ]; then
+  - |
+    if [ "$GOOS" = "linux" ]; then
+      sudo mkdir -p /etc/containerd
+      sudo bash -c "cat > /etc/containerd/config.toml <<EOF
+      [plugins.cri.containerd.default_runtime]
+        runtime_type = \"${TEST_RUNTIME}\"
+    EOF"
       sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
-      sudo ctr version ;
-      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
-      TEST_RC=$? ;
-      test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log ;
-      sudo pkill containerd ;
-      test $TEST_RC -eq 0 || /bin/false ;
+      sudo ctr version
+      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8
+      TEST_RC=$?
+      test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log
+      sudo pkill containerd
+      sudo rm -rf /etc/containerd
+      test $TEST_RC -eq 0 || /bin/false
     fi
 
 after_success:

api/next.pb.txt

@@ -4211,28 +4211,61 @@ file {
   dependency: "google/protobuf/empty.proto"
   dependency: "google/protobuf/timestamp.proto"
   message_type {
-    name: "PublishRequest"
+    name: "ForwardRequest"
     field {
-      name: "topic"
+      name: "envelope"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".containerd.services.events.ttrpc.v1.Envelope"
+      json_name: "envelope"
+    }
+  }
+  message_type {
+    name: "Envelope"
+    field {
+      name: "timestamp"
       number: 1
       label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Timestamp"
+      options {
+        65001: 0
+        65010: 1
+      }
+      json_name: "timestamp"
+    }
+    field {
+      name: "namespace"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "namespace"
+    }
+    field {
+      name: "topic"
+      number: 3
+      label: LABEL_OPTIONAL
       type: TYPE_STRING
       json_name: "topic"
     }
     field {
       name: "event"
-      number: 2
+      number: 4
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Any"
       json_name: "event"
     }
+    options {
+      64400: 1
+    }
   }
   service {
     name: "Events"
     method {
-      name: "Publish"
-      input_type: ".containerd.services.events.ttrpc.v1.PublishRequest"
+      name: "Forward"
+      input_type: ".containerd.services.events.ttrpc.v1.ForwardRequest"
       output_type: ".google.protobuf.Empty"
     }
   }