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

fix not working purge log scheduler #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix not working purge log scheduler #24

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
12 changes: 8 additions & 4 deletions storage/disk_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const (
//FileMode is default file mode
FileMode = 0600
//DirMode is default dir mode
DirMode = 0700
DirMode = 0700
purgeLogInterval = time.Second * 30
)

//DiskStorage is the Storage store data in disk
Expand Down Expand Up @@ -394,21 +395,21 @@ func (s *DiskStorage) StartPurgeLog() {
s.purgeCtx, s.purgeCancel = context.WithCancel(context.Background())
s.purgeQuitC = make(chan struct{})
s.purgeStarted.Store(true)
timer := time.NewTimer(time.Second * 30)
timer := time.NewTimer(purgeLogInterval)

defer func() {
close(s.purgeQuitC)
timer.Stop()
}()

var deleteSegments []*Segment
for {
select {
case <-s.purgeCtx.Done():
log.Log.Info("log purger quit")
return
case <-timer.C:
// check and purge segments
var deleteSegments []*Segment
s.Mu.Lock()
if s.ReserveSegmentCount < len(s.Segments) {
deleteCount := len(s.Segments) - s.ReserveSegmentCount
Expand All @@ -418,12 +419,15 @@ func (s *DiskStorage) StartPurgeLog() {
s.Mu.Unlock()

if len(deleteSegments) == 0 {
timer.Reset(purgeLogInterval)
continue
}
err := s.purgeSegments(deleteSegments, true)
if err != nil {
log.Log.Fatalf("purgeSegments error, err:%s, deleteSegments:%v", err, deleteSegments)
// fatal could could interrupt state if error is from munmap API
log.Log.Errorf("purgeSegments error, err:%s, deleteSegments:%v", err, deleteSegments)
}
timer.Reset(purgeLogInterval)
}
}
}
Expand Down