adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sshbytestream: exited command always returns io.EOF

Browse Source
This commit is contained in:
Christian Schwarz
2017-05-06 23:44:59 +02:00
parent 82beea94d5
commit cb37470010
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sshbytestream/ssh.go
+3 -7
View File
@@ -116,7 +116,7 @@ func Outgoing(remote SSHTransport) (conn io.ReadWriteCloser, err error) {
WaitErr: err, WaitErr: err,
} }
} else { } else {
f.SSHCommandError = nil f.SSHCommandError = io.EOF
} }
}() }()
@@ -139,9 +139,7 @@ func (f *ForkedSSHReadWriteCloser) Read(p []byte) (n int, err error) {
if n, err = f.RemoteStdout.Read(p); err == io.EOF { if n, err = f.RemoteStdout.Read(p); err == io.EOF {
// the ssh command has exited, but we need to wait for post-portem to finish // the ssh command has exited, but we need to wait for post-portem to finish
f.exitWaitGroup.Wait() f.exitWaitGroup.Wait()
if f.SSHCommandError != nil { err = f.SSHCommandError
err = f.SSHCommandError
}
} }
return return
} }
@@ -153,9 +151,7 @@ func (f *ForkedSSHReadWriteCloser) Write(p []byte) (n int, err error) {
if n, err = f.RemoteStdin.Write(p); err == io.EOF { if n, err = f.RemoteStdin.Write(p); err == io.EOF {
// the ssh command has exited, but we need to wait for post-portem to finish // the ssh command has exited, but we need to wait for post-portem to finish
f.exitWaitGroup.Wait() f.exitWaitGroup.Wait()
if f.SSHCommandError != nil { err = f.SSHCommandError
err = f.SSHCommandError
}
} }
return return
} }