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

Memory edit #41

Merged
merged 3 commits into from
Feb 18, 2022
Merged

Memory edit #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5d7fe
Pass connection id to readbuffer to enhance logging
ibuildthecloud Feb 11, 2022
266bce3
Reset buffer to free extra memory held by the connection
ibuildthecloud Feb 11, 2022
31afcc1
Change error log to debug log
rmweir Feb 15, 2022
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
2 changes: 1 addition & 1 deletion connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func newConnection(connID int64, session *Session, proto, address string) *conne
session: session,
}
c.backPressure = newBackPressure(c)
c.buffer = newReadBuffer(c.backPressure)
c.buffer = newReadBuffer(connID, c.backPressure)
metrics.IncSMTotalAddConnectionsForWS(session.clientKey, proto, address)
return c
}
Expand Down
22 changes: 14 additions & 8 deletions readbuffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ const (
)

type readBuffer struct {
readCount, offerCount int64
cond sync.Cond
deadline time.Time
buf bytes.Buffer
err error
backPressure *backPressure
id, readCount, offerCount int64
cond sync.Cond
deadline time.Time
buf bytes.Buffer
err error
backPressure *backPressure
}

func newReadBuffer(backPressure *backPressure) *readBuffer {
func newReadBuffer(id int64, backPressure *backPressure) *readBuffer {
return &readBuffer{
id: id,
backPressure: backPressure,
cond: sync.Cond{
L: &sync.Mutex{},
Expand Down Expand Up @@ -60,7 +61,7 @@ func (r *readBuffer) Offer(reader io.Reader) error {
}

if r.buf.Len() > MaxBuffer*2 {
logrus.Errorf("remotedialer buffer exceeded, length: %d", r.buf.Len())
logrus.Errorf("remotedialer buffer exceeded id=%d, length: %d", r.id, r.buf.Len())
}

return nil
Expand All @@ -87,6 +88,11 @@ func (r *readBuffer) Read(b []byte) (int, error) {
return n, nil
}

if r.buf.Cap() > MaxBuffer/8 {
logrus.Debugf("resetting remotedialer buffer id=%d to zero, old cap %d", r.id, r.buf.Cap())
r.buf = bytes.Buffer{}
}

if r.err != nil {
return 0, r.err
}
Expand Down