Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: Optimize sftp upload and download speed #1557

Merged
merged 1 commit into from
Oct 22, 2024
Merged

perf: Optimize sftp upload and download speed #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions pkg/handler/sftp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,24 @@ func (s *SftpHandler) Filewrite(r *sftp.Request) (io.WriterAt, error) {
if err != nil {
return nil, err
}

go func() {
<-r.Context().Done()

fileInfo, err2 := f.Stat()
if err2 != nil {
logger.Errorf("Get file %s stat err: %s", r.Filepath, err2)
return
}

if err1 := s.recorder.ChunkedRecord(f.FTPLog, f, 0, fileInfo.Size()); err1 != nil {
logger.Errorf("Record file %s err: %s", r.Filepath, err1)
}

if err := f.Close(); err != nil {
logger.Errorf("Remote sftp file %s close err: %s", r.Filepath, err)
}
logger.Infof("Sftp file write %s done", r.Filepath)
s.recorder.FinishFTPFile(f.FTPLog.ID)
}()
return NewWriterAt(f, s.recorder), err
}
Expand All @@ -100,20 +111,18 @@ func (s *SftpHandler) Fileread(r *sftp.Request) (io.ReaderAt, error) {
return nil, err
}

if err1 := s.recorder.ChunkedRecord(f.FTPLog, f, 0, fileInfo.Size()); err1 != nil {
logger.Errorf("Record file %s err: %s", r.Filepath, err1)
}

// 重置文件指针
_, _ = f.Seek(0, io.SeekStart)
go func() {
<-r.Context().Done()

if err1 := s.recorder.ChunkedRecord(f.FTPLog, f, 0, fileInfo.Size()); err1 != nil {
logger.Errorf("Record file %s err: %s", r.Filepath, err1)
}

if err2 := f.Close(); err2 != nil {
logger.Errorf("Remote sftp file %s close err: %s", r.Filepath, err2)
}
logger.Infof("Sftp File read %s done", r.Filepath)
s.recorder.FinishFTPFile(f.FTPLog.ID)

logger.Infof("Sftp File read %s done", r.Filepath)
}()
// 包裹一层，兼容 WinSCP 目录的批量下载
return NewReaderAt(f), err
Expand Down Expand Up @@ -153,18 +162,10 @@ type clientReadWritAt struct {
}

func (c *clientReadWritAt) WriteAt(p []byte, off int64) (n int, err error) {
c.mu.Lock()
defer c.mu.Unlock()
if err1 := c.recorder.RecordFtpChunk(c.f.FTPLog, p, off); err1 != nil {
logger.Errorf("Record write err: %s", err1)
}
_, _ = c.f.Seek(off, 0)
return c.f.Write(p)
return c.f.WriteAt(p, off)
}

func (c *clientReadWritAt) ReadAt(p []byte, off int64) (n int, err error) {
c.mu.Lock()
defer c.mu.Unlock()
return c.f.ReadAt(p, off)
}

Expand Down
37 changes: 1 addition & 36 deletions pkg/proxy/recorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,24 +351,6 @@ func (r *FTPFileRecorder) CreateFTPFileInfo(logData *model.FTPLog) (info *FTPFil
return info, nil
}

func (r *FTPFileRecorder) RecordFtpChunk(ftpLog *model.FTPLog, p []byte, off int64) (err error) {
if r.isNullStorage() {
return
}
info := r.getFTPFile(ftpLog.ID)
if info == nil {
info, err = r.CreateFTPFileInfo(ftpLog)
}
if err != nil {
return
}
if info.isExceedWrittenSize() {
logger.Errorf("FTP file %s is exceeds the max limit and discard it", ftpLog.ID)
return nil
}
return info.WriteChunk(p, off)
}

func (r *FTPFileRecorder) FinishFTPFile(id string) {
info := r.getFTPFile(id)
if info == nil {
Expand Down Expand Up @@ -409,7 +391,7 @@ func (r *FTPFileRecorder) ChunkedRecord(ftpLog *model.FTPLog, readerAt io.Reader
return err
}

if info.isExceedWrittenSize() {
if info.isExceedWrittenSize() || totalSize >= info.maxWrittenSize {
logger.Errorf("FTP file %s is exceeds the max limit and discard it", ftpLog.ID)
return nil
}
Expand Down Expand Up @@ -495,23 +477,6 @@ type FTPFileInfo struct {
writtenBytes int64
}

func (f *FTPFileInfo) WriteChunk(p []byte, off int64) error {
var (
nw int
err error
)
_, err = f.fd.Seek(off, io.SeekStart)
if err != nil {
return err
}
nw, err = f.fd.Write(p)
if nw > 0 {
f.writtenBytes += int64(nw)
}
return err

}

func (f *FTPFileInfo) WriteFromReader(r io.Reader) error {
buf := make([]byte, 32*1024)
var err error
Expand Down