Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Speed up event processing #8

Merged
merged 12 commits into from
Apr 24, 2020
Merged

Speed up event processing #8

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb101e0
Speed up event processing by introducing duplicate cache
ammario Apr 24, 2020
2288735
Process safe events concurrently
ammario Apr 24, 2020
ba23ea5
Remove single file support
ammario Apr 24, 2020
c2ca1ea
Improve replace message
ammario Apr 24, 2020
ed23f64
Document test command
ammario Apr 24, 2020
c305b9d
Improve dropped event calculation
ammario Apr 24, 2020
4e31fe9
Add DEBUG_RSYNC env
ammario Apr 24, 2020
a675d5e
Create watch before initial sync
ammario Apr 24, 2020
423278b
Support file deletion again
ammario Apr 24, 2020
65be003
Add semaphore to pushing
ammario Apr 24, 2020
4905bbd
Change initial sync to Success level
ammario Apr 24, 2020
b0c4bc3
Comment on dir translation
ammario Apr 24, 2020
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
Prev Previous commit
Next Next commit
Improve dropped event calculation
  • Loading branch information
@ammario
ammario committed Apr 24, 2020
commit c305b9dbca5934d38f2b1fa4e327c7ff7fa76be1
15 changes: 11 additions & 4 deletions internal/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"path"
"path/filepath"
"sync"
"sync/atomic"
"time"

"github.com/gorilla/websocket"
Expand Down Expand Up @@ -84,7 +85,7 @@ func (s Sync) initSync() error {

start := time.Now()
// Delete old files on initial sync (e.g git checkout).
err := s.syncPaths(true, s.LocalDir + "/.", s.RemoteDir)
err := s.syncPaths(true, s.LocalDir+"/.", s.RemoteDir)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't hurt to comment on why this is necessary

if err == nil {
flog.Info("finished initial sync (%v)", time.Since(start).Truncate(time.Millisecond))
}
Expand Down Expand Up @@ -167,7 +168,6 @@ func (s Sync) work(ev timedEvent) {
}
}


var ErrRestartSync = errors.New("the sync exited because it was overloaded, restart it")

// workEventGroup converges a group of events to prevent duplicate work.
Expand Down Expand Up @@ -239,14 +239,21 @@ func (s Sync) Run() error {

flog.Info("watching %s for changes", s.LocalDir)

var droppedEvents uint64
// Timed events lets us track how long each individual file takes to update.
timedEvents := make(chan timedEvent, cap(events))
go func() {
defer close(timedEvents)
for event := range events {
timedEvents <- timedEvent{
select {
case timedEvents <- timedEvent{
CreatedAt: time.Now(),
EventInfo: event,
}:
default:
if atomic.AddUint64(&droppedEvents, 1) == 1 {
flog.Info("dropped event, sync should restart soon")
}
}
}
}()
Expand All @@ -262,7 +269,7 @@ func (s Sync) Run() error {

select {
case ev := <-timedEvents:
if len(events) > maxInflightInotify {
if atomic.LoadUint64(&droppedEvents) > 0 {
return ErrRestartSync
}

Expand Down