Skip to content

Add a 'start' tailer timestamp, stop passing collection to .tailQuery() #16

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

Merged
merged 1 commit into from
Jul 18, 2018
Merged

Add a 'start' tailer timestamp, stop passing collection to .tailQuery() #16

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
22 changes: 14 additions & 8 deletions internal/oplog/oplog_tail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import (
type chanDataTye []byte

type OplogTail struct {
session *mgo.Session
oplogCollection string
lastOplogTimestamp *bson.MongoTimestamp
session *mgo.Session
oplogCollection string
startOplogTimestamp *bson.MongoTimestamp
lastOplogTimestamp *bson.MongoTimestamp

totalSize int64
docsCount int64
Expand Down Expand Up @@ -55,11 +56,11 @@ func OpenAt(session *mgo.Session, t time.Time, c uint32) (*OplogTail, error) {
if err != nil {
return nil, err
}
currentTimestamp, err := bson.NewMongoTimestamp(t, c)
mongoTimestamp, err := bson.NewMongoTimestamp(t, c)
if err != nil {
return nil, err
}
ot.lastOplogTimestamp = &currentTimestamp
ot.startOplogTimestamp = &mongoTimestamp
go ot.tail()
return ot, nil
}
Expand Down Expand Up @@ -126,7 +127,7 @@ func (ot *OplogTail) setRunning(state bool) {

func (ot *OplogTail) tail() {
col := ot.session.DB(oplogDB).C(ot.oplogCollection)
iter := col.Find(ot.tailQuery(col)).LogReplay().Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
iter := col.Find(ot.tailQuery()).LogReplay().Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
for {
select {
case <-ot.stopChan:
Expand All @@ -141,6 +142,9 @@ func (ot *OplogTail) tail() {
err := result.Unmarshal(&oplog)
if err == nil {
ot.dataChan <- result.Data
if ot.startOplogTimestamp == nil {
ot.startOplogTimestamp = &oplog.Timestamp
}
ot.lastOplogTimestamp = &oplog.Timestamp
continue
}
Expand All @@ -152,14 +156,16 @@ func (ot *OplogTail) tail() {
if iter.Err() != nil {
iter.Close()
}
iter = col.Find(ot.tailQuery(col)).LogReplay().Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
iter = col.Find(ot.tailQuery()).LogReplay().Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
}
}

func (ot *OplogTail) tailQuery(col *mgo.Collection) bson.M {
func (ot *OplogTail) tailQuery() bson.M {
query := bson.M{"op": bson.M{"$ne": mdbstructs.OperationNoop}}
if ot.lastOplogTimestamp != nil {
query["ts"] = bson.M{"$gt": *ot.lastOplogTimestamp}
} else if ot.startOplogTimestamp != nil {
query["ts"] = bson.M{"$gte": *ot.startOplogTimestamp}
} else {
mongoTimestamp, _ := bson.NewMongoTimestamp(time.Now(), 0)
query["ts"] = bson.M{"$gte": mongoTimestamp}
Expand Down