From c19cf02580bb2362b6b327c713809f40762907bf Mon Sep 17 00:00:00 2001 From: yangxin <245051644@qq.com> Date: Tue, 30 Aug 2022 03:56:50 +0000 Subject: [PATCH] Remove redundant code. Signed-off-by: yangxin <245051644@qq.com> --- .../0001-Containerd-remote-run-patch.patch | 29 ---- .../docker/0001-Docker-remote-run-patch.patch | 158 ------------------ 2 files changed, 187 deletions(-) diff --git a/usecases/transparent-offload/patches/containerd/0001-Containerd-remote-run-patch.patch b/usecases/transparent-offload/patches/containerd/0001-Containerd-remote-run-patch.patch index bbc74b5..d1ff36c 100644 --- a/usecases/transparent-offload/patches/containerd/0001-Containerd-remote-run-patch.patch +++ b/usecases/transparent-offload/patches/containerd/0001-Containerd-remote-run-patch.patch @@ -33,14 +33,6 @@ index ca0a90ad0..74c577f8b 100644 flag.Parse() } -@@ -105,6 +105,7 @@ func executeShim() error { - if err != nil { - return err - } -+ - dump := make(chan os.Signal, 32) - signal.Notify(dump, syscall.SIGUSR1) - @@ -164,7 +165,8 @@ func serve(ctx context.Context, server *ttrpc.Server, path string) error { if len(path) > 106 { return errors.Errorf("%q: unix socket path too long (> 106)", path) @@ -188,7 +180,6 @@ index 015d88c2d..82a2eee82 100644 "address": address, }).Infof("shim placed in cgroup %s", cgroup) } -+ //time.Sleep(1 * time.Second) if err = sys.SetOOMScore(cmd.Process.Pid, sys.OOMScoreMaxKillable); err != nil { return nil, nil, errors.Wrap(err, "failed to set OOM Score on shim") } @@ -274,14 +265,6 @@ diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go index d76d5803d..96c61fc82 100644 --- a/runtime/v1/shim/service.go +++ b/runtime/v1/shim/service.go -@@ -93,6 +93,7 @@ func NewService(config Config, publisher events.Publisher) (*Service, error) { - return nil, errors.Wrap(err, "failed to initialized platform behavior") - } - go s.forward(publisher) -+ - return s, nil - } - @@ -160,7 +161,7 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (_ * } process, err := newInit( @@ -356,18 +339,6 @@ index 345be4e46..c0a954def 100644 if err != nil { return "", err } -diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go -index e8d95b43b..f13386d07 100644 ---- a/vendor/google.golang.org/grpc/clientconn.go -+++ b/vendor/google.golang.org/grpc/clientconn.go -@@ -456,7 +456,6 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * - blockingpicker: newPickerWrapper(), - } - cc.ctx, cc.cancel = context.WithCancel(context.Background()) -- - for _, opt := range opts { - opt(&cc.dopts) - } -- 2.30.0 diff --git a/usecases/transparent-offload/patches/docker/0001-Docker-remote-run-patch.patch b/usecases/transparent-offload/patches/docker/0001-Docker-remote-run-patch.patch index f95c713..bc3e1b5 100644 --- a/usecases/transparent-offload/patches/docker/0001-Docker-remote-run-patch.patch +++ b/usecases/transparent-offload/patches/docker/0001-Docker-remote-run-patch.patch @@ -64,164 +64,6 @@ index 631daf10a5..eafa67548a 100644 + //return err } } - -diff --git a/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go b/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go -index f4c4276848..80e2492e7a 100644 ---- a/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go -+++ b/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go -@@ -4,11 +4,14 @@ package libnetwork - - import ( - "encoding/json" -+ "hash/crc32" -+ "strconv" -+ "io/ioutil" - "fmt" - "io" -- "io/ioutil" - "net" - "os" -+ "log" - - "github.com/docker/libnetwork/types" - "github.com/opencontainers/runc/libcontainer/configs" -@@ -56,23 +59,40 @@ func processSetKeyReexec() { - - // SetExternalKey provides a convenient way to set an External key to a sandbox - func SetExternalKey(controllerID string, containerID string, key string) error { -+ shimHost := os.Getenv("CONTROLLER_HOST") -+ log.Println("SetExternalKey key", key) - keyData := setKeyData{ - ContainerID: containerID, - Key: key} -+ if shimHost != "" { -+ port := (crc32.ChecksumIEEE([]byte(controllerID)))%10000 + 40000 -+ address := shimHost + ":" + strconv.Itoa(int(port)) -+ c, err := net.Dial("tcp", address) -+ if err != nil { -+ return err -+ } -+ defer c.Close() - -- c, err := net.Dial("unix", udsBase+controllerID+".sock") -- if err != nil { -- return err -- } -- defer c.Close() -+ if err := sendKey(c, keyData); err != nil { -+ return fmt.Errorf("sendKey failed with : %v", err) -+ } -+ return processReturn(c) -+ } else { -+ c, err := net.Dial("unix", udsBase+controllerID+".sock") -+ if err != nil { -+ return err -+ } -+ defer c.Close() - -- if err = sendKey(c, keyData); err != nil { -- return fmt.Errorf("sendKey failed with : %v", err) -+ if err := sendKey(c, keyData); err != nil { -+ return fmt.Errorf("sendKey failed with : %v", err) -+ } -+ return processReturn(c) - } -- return processReturn(c) - } - - func sendKey(c net.Conn, data setKeyData) error { -+ /* - var err error - defer func() { - if err != nil { -@@ -85,8 +105,8 @@ func sendKey(c net.Conn, data setKeyData) error { - return err - } - -- _, err = c.Write(b) -- return err -+ _, err = c.Write(b)*/ -+ return nil - } - - func processReturn(r io.Reader) error { -@@ -102,31 +122,50 @@ func processReturn(r io.Reader) error { - } - - func (c *controller) startExternalKeyListener() error { -- if err := os.MkdirAll(udsBase, 0600); err != nil { -- return err -- } -- uds := udsBase + c.id + ".sock" -- l, err := net.Listen("unix", uds) -- if err != nil { -- return err -- } -- if err := os.Chmod(uds, 0600); err != nil { -- l.Close() -- return err -+ shimHost := os.Getenv("CONTROLLER_HOST") -+ log.Println("controller_id", c.id) -+ if shimHost != ""{ -+ port := (crc32.ChecksumIEEE([]byte(c.id)))%10000 + 40000 -+ address := shimHost + ":" + strconv.Itoa(int(port)) -+ l, err := net.Listen("tcp", address) -+ if err != nil { -+ return err -+ } -+ c.Lock() -+ c.extKeyListener = l -+ c.Unlock() -+ go c.acceptClientConnections(address, l) -+ return nil -+ } else { -+ if err := os.MkdirAll(udsBase, 0600); err != nil { -+ return err -+ } -+ uds := udsBase + c.id + ".sock" -+ l, err := net.Listen("unix", uds) -+ if err != nil { -+ return err -+ } -+ if err := os.Chmod(uds, 0600); err != nil { -+ l.Close() -+ return err -+ } -+ c.Lock() -+ c.extKeyListener = l -+ c.Unlock() -+ -+ go c.acceptClientConnections(uds, l) -+ return nil - } -- c.Lock() -- c.extKeyListener = l -- c.Unlock() -- -- go c.acceptClientConnections(uds, l) -- return nil -+ - } - - func (c *controller) acceptClientConnections(sock string, l net.Listener) { -+ shimHost := os.Getenv("CONTROLLER_HOST") -+ log.Println("CONTROLLER_HOST", shimHost) - for { - conn, err := l.Accept() - if err != nil { -- if _, err1 := os.Stat(sock); os.IsNotExist(err1) { -+ if _, err1 := os.Stat(sock); os.IsNotExist(err1) && shimHost != "" { - logrus.Debugf("Unix socket %s doesn't exist. cannot accept client connections", sock) - return - } -@@ -160,7 +199,6 @@ func (c *controller) processExternalKey(conn net.Conn) error { - if err = json.Unmarshal(buf[0:nr], &s); err != nil { - return err - } -- - var sandbox Sandbox - search := SandboxContainerWalker(&sandbox, s.ContainerID) - c.WalkSandboxes(search) -- 2.17.1 -- Gitee