From 534e2cca90efbe0bc322e845b17ff393390b5aa4 Mon Sep 17 00:00:00 2001 From: caoxianfei1 Date: Wed, 22 Nov 2023 19:59:42 +0800 Subject: [PATCH] Fix(curveadm deploy): newer version ss answers invalid arument Signed-off-by: caoxianfei1 --- internal/task/task/checker/network.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/task/task/checker/network.go b/internal/task/task/checker/network.go index 1869eb1cb..ece0e0595 100644 --- a/internal/task/task/checker/network.go +++ b/internal/task/task/checker/network.go @@ -54,9 +54,14 @@ func checkPortInUse(success *bool, out *string, host string, port int) step.Lamb } if len(*out) > 0 { + if *out == "RTNETLINK answers: Invalid argument" { + return nil + } + return errno.ERR_PORT_ALREADY_IN_USE. F("host=%s, port=%d", host, port) } + return nil } } @@ -103,6 +108,7 @@ func (s *step2CheckPortStatus) Execute(ctx *context.Context) error { steps = append(steps, &step.ContainerExec{ ContainerId: s.containerId, Command: command, + Success: s.success, Out: &out, ExecOptions: s.curveadm.ExecOptions(), })