修复主动关闭连接误判并保存人工处置实测进度
This commit is contained in:
1 parent
457f61721c
commit
7fa5e9b3d2
8 files changed
+162
-11
No files matched your search
@@ -11,6 +11,7 @@ import (
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
@@ -213,6 +214,8 @@ type sshClientAdapter struct {
|
||||
ssh *ssh.Client
|
||||
sftp *sftp.Client
|
||||
disconnected atomic.Bool
|
||||
closeOnce sync.Once
|
||||
closeErr error
|
||||
}
|
||||
|
||||
// sshOperation 取消时关闭传输并等待操作退出,避免回滚与仍在写入的操作并行。
|
||||
@@ -450,18 +453,24 @@ func (c *sshClientAdapter) runCommand(command []string) (CommandResult, error) {
|
||||
}
|
||||
|
||||
func (c *sshClientAdapter) Close() error {
|
||||
var first error
|
||||
// 先关闭传输,避免无响应的 SFTP 服务阻塞关闭过程。
|
||||
if c.ssh != nil {
|
||||
c.disconnected.Store(true)
|
||||
first = c.ssh.Close()
|
||||
}
|
||||
if c.sftp != nil {
|
||||
if err := c.sftp.Close(); err != nil && first == nil {
|
||||
first = err
|
||||
c.closeOnce.Do(func() {
|
||||
wasDisconnected := c.disconnected.Swap(true)
|
||||
// 先关闭传输,避免无响应的 SFTP 服务阻塞关闭过程。
|
||||
if c.ssh != nil {
|
||||
c.closeErr = c.ssh.Close()
|
||||
}
|
||||
}
|
||||
return first
|
||||
if c.sftp != nil {
|
||||
if err := c.sftp.Close(); err != nil && c.closeErr == nil {
|
||||
// 正常主动关闭传输后,SFTP 收尾可能返回 EOF 或连接已关闭。
|
||||
// 仅消除本次主动关闭的预期错误,保留既有断连及其他关闭失败。
|
||||
if c.ssh != nil && !wasDisconnected && (errors.Is(err, io.EOF) || errors.Is(err, net.ErrClosed)) {
|
||||
return
|
||||
}
|
||||
c.closeErr = err
|
||||
}
|
||||
}
|
||||
})
|
||||
return c.closeErr
|
||||
}
|
||||
|
||||
func validateCommand(command []string) error {
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
package deployment
|
||||
|
||||
import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/pkg/sftp"
|
||||
)
|
||||
|
||||
func TestSSHCloseHealthyTransportDoesNotReportSFTPShutdownEOF(t *testing.T) {
|
||||
factory, server := safetyFactory(t, requestSFTPHandler(sftp.InMemHandler(), false, false))
|
||||
client, err := factory.Connect(t.Context(), server)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = client.Close() })
|
||||
if err := client.MkdirAll(t.Context(), "/close-check"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := client.Close(); err != nil {
|
||||
t.Fatalf("正常关闭连接不得把本机主动关闭产生的错误当作部署失败:%v", err)
|
||||
}
|
||||
if err := client.Close(); err != nil {
|
||||
t.Fatalf("重复关闭应返回相同的成功结果:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSSHCloseConcurrentCallsShareResult(t *testing.T) {
|
||||
factory, server := safetyFactory(t, requestSFTPHandler(sftp.InMemHandler(), false, false))
|
||||
client, err := factory.Connect(t.Context(), server)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = client.Close() })
|
||||
var calls sync.WaitGroup
|
||||
for range 8 {
|
||||
calls.Go(func() {
|
||||
if err := client.Close(); err != nil {
|
||||
t.Errorf("并发关闭不得制造伪失败:%v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
calls.Wait()
|
||||
}
|
||||
|
||||
func TestSSHClosePreservesPriorTransportFailure(t *testing.T) {
|
||||
factory, server := safetyFactory(t, requestSFTPHandler(sftp.InMemHandler(), false, false))
|
||||
client, err := factory.Connect(t.Context(), server)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = client.Close() })
|
||||
adapter := client.(*sshClientAdapter)
|
||||
adapter.disconnected.Store(true)
|
||||
if err := adapter.ssh.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
first := client.Close()
|
||||
if first == nil {
|
||||
t.Fatal("既有传输失败不能被正常关闭分支吞掉")
|
||||
}
|
||||
if second := client.Close(); second != first {
|
||||
t.Fatalf("重复关闭必须保留首次失败:%v / %v", first, second)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user