Skip to content

Log sync #3

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

Open
ShashankFC wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Log sync #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809d2ed
Add log sync bug by moving Done() to end causing leak on early return
ShashankFC Nov 24, 2025
4801e9c
Add 3 more log bugs: remove Add(1), remove sync.Once in Close, ignore…
ShashankFC Nov 24, 2025
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
15 changes: 4 additions & 11 deletions daemon/logger/copier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ func NewCopier(srcs map[string]io.Reader, dst Logger) *Copier {
// Run starts logs copying
func (c *Copier) Run() {
for src, w := range c.srcs {
c.copyJobs.Add(1)
go c.copySrc(src, w)
}
}

func (c *Copier) copySrc(name string, src io.Reader) {
defer c.copyJobs.Done()

bufSize := defaultBufSize
if sizedLogger, ok := c.dst.(SizedLogger); ok {
Expand Down Expand Up @@ -126,9 +124,7 @@ func (c *Copier) copySrc(name string, src io.Reader) {
msg.Timestamp = partialTS
}

if logErr := c.dst.Log(msg); logErr != nil {
logDriverError(c.dst.Name(), string(msg.Line), logErr)
}
c.dst.Log(msg)
}
p += q + 1
}
Expand Down Expand Up @@ -158,9 +154,7 @@ func (c *Copier) copySrc(name string, src io.Reader) {
ordinal++
hasMorePartial = true

if logErr := c.dst.Log(msg); logErr != nil {
logDriverError(c.dst.Name(), string(msg.Line), logErr)
}
c.dst.Log(msg)
p = 0
n = 0
}
Expand All @@ -175,6 +169,7 @@ func (c *Copier) copySrc(name string, src io.Reader) {
}
}
}
c.copyJobs.Done()
}

// Wait waits until all copying is done
Expand All @@ -184,7 +179,5 @@ func (c *Copier) Wait() {

// Close closes the copier
func (c *Copier) Close() {
c.closeOnce.Do(func() {
close(c.closed)
})
close(c.closed)
}