Skip to content

Commit

Permalink
Merge pull request #22 from GreenmaskIO/hotfix_v0.1.6
Browse files Browse the repository at this point in the history
Fixed uncontrolled buffer growth in the restore command
  • Loading branch information
wwoytenko committed Feb 23, 2024
2 parents c0977a1 + fdb22a8 commit 7f7f6a6
Showing 1 changed file with 24 additions and 13 deletions.
37 changes: 24 additions & 13 deletions internal/db/postgres/restorers/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ func NewTableRestorer(entry *toc.Entry, st storages.Storager) *TableRestorer {
}

func (td *TableRestorer) Execute(ctx context.Context, tx pgx.Tx) error {
// TODO: Refactor this logic
// 1. Decompose the Execute method into separate functions
// 2. Add tests
// 3. Get rid of the anonymous functions below

return func() error {
if td.Entry.FileName == nil {
Expand All @@ -63,12 +67,10 @@ func (td *TableRestorer) Execute(ctx context.Context, tx pgx.Tx) error {

log.Debug().Str("copyStmt", *td.Entry.CopyStmt).Msgf("performing pgcopy statement")
frontend := tx.Conn().PgConn().Frontend()
frontend.Send(&pgproto3.Query{
String: *td.Entry.CopyStmt,
})

if err = frontend.Flush(); err != nil {
return err
err = sendMessage(frontend, &pgproto3.Query{String: *td.Entry.CopyStmt})
if err != nil {
return fmt.Errorf("error sending Query message: %w", err)
}

// Prepare for streaming the pgcopy data
Expand Down Expand Up @@ -108,19 +110,19 @@ func (td *TableRestorer) Execute(ctx context.Context, tx pgx.Tx) error {
n, err = gz.Read(buf)
if err != nil {
if errors.Is(err, io.EOF) {
frontend.Send(&pgproto3.CopyDone{})
completionErr := sendMessage(frontend, &pgproto3.CopyDone{})
if completionErr != nil {
return fmt.Errorf("error sending CopyDone message: %w", err)
}
break
}
return fmt.Errorf("error readimg from table dump: %w", err)
}

frontend.Send(&pgproto3.CopyData{
Data: buf[:n],
})
}

if err = frontend.Flush(); err != nil {
return err
err = sendMessage(frontend, &pgproto3.CopyData{Data: buf[:n]})
if err != nil {
return fmt.Errorf("error sending DopyData message: %w", err)
}
}

// Perform post streaming handling
Expand Down Expand Up @@ -152,3 +154,12 @@ func (td *TableRestorer) Execute(ctx context.Context, tx pgx.Tx) error {
func (td *TableRestorer) DebugInfo() string {
return fmt.Sprintf("table %s.%s", *td.Entry.Namespace, *td.Entry.Tag)
}

// sendMessage - send a message to the PostgreSQL backend and flush a buffer
func sendMessage(frontend *pgproto3.Frontend, msg pgproto3.FrontendMessage) error {
frontend.Send(msg)
if err := frontend.Flush(); err != nil {
return fmt.Errorf("error flushing pgx frontend buffer: %w", err)
}
return nil
}

0 comments on commit 7f7f6a6

Please sign in to comment.