Fix(curveadm deploy): newer version ss answers invalid arument

caoxianfei1 · caoxianfei1 · commit 534e2cca90ef · 2023-11-23T14:32:23.000+08:00
Signed-off-by: caoxianfei1 &lt;caoxianfei@corp.netease.com&gt;
diff --git 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(),
 	})

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,14 @@ func checkPortInUse(success bool, out string, host string, port int) step.Lamb`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if len(*out) > 0 {`
	`57`	`+ if *out == "RTNETLINK answers: Invalid argument" {`
	`58`	`+ return nil`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`return errno.ERR_PORT_ALREADY_IN_USE.`
`58`	`62`	`F("host=%s, port=%d", host, port)`
`59`	`63`	`}`
	`64`	`+`
`60`	`65`	`return nil`
`61`	`66`	`}`
`62`	`67`	`}`
`@@ -103,6 +108,7 @@ func (s step2CheckPortStatus) Execute(ctx context.Context) error {`
`103`	`108`	`steps = append(steps, &step.ContainerExec{`
`104`	`109`	`ContainerId: s.containerId,`
`105`	`110`	`Command: command,`
	`111`	`+ Success: s.success,`
`106`	`112`	`Out: &out,`
`107`	`113`	`ExecOptions: s.curveadm.ExecOptions(),`
`108`	`114`	`})`