Skip to content

Default oplog open is master last oplog write v2 #21

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 5 commits into from
Jul 18, 2018
Merged

Default oplog open is master last oplog write v2 #21

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5541373
Use { ts: {$gt: isMaster.lastWrite.opTime.Ts} } as default start point
timvaillancourt Jul 18, 2018
37cb78b
Rename var
timvaillancourt Jul 18, 2018
dcb6ac8
Fix merge
timvaillancourt Jul 18, 2018
b083ddc
Use ot.session instead of passing it around
timvaillancourt Jul 18, 2018
3f6d4f8
Fix merge
timvaillancourt Jul 18, 2018
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
16 changes: 8 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 @@ -47,7 +47,7 @@ func Open(session *mgo.Session) (*OplogTail, error) {
if err != nil {
return nil, err
}
go ot.tail(session)
go ot.tail()
return ot, nil
}

Expand All @@ -61,7 +61,7 @@ func OpenAt(session *mgo.Session, t time.Time, c uint32) (*OplogTail, error) {
return nil, err
}
ot.startOplogTimestamp = &mongoTimestamp
go ot.tail(session)
go ot.tail()
return ot, nil
}

Expand All @@ -82,7 +82,7 @@ func open(session *mgo.Session) (*OplogTail, error) {
running: true,
}
ot.readFunc = makeReader(ot)
go ot.tail(session)
go ot.tail()
return ot, nil
}

Expand Down Expand Up @@ -125,10 +125,10 @@ func (ot *OplogTail) setRunning(state bool) {
ot.running = state
}

func (ot *OplogTail) tail(session *mgo.Session) {
func (ot *OplogTail) tail() {
col := ot.session.DB(oplogDB).C(ot.oplogCollection)
comment := "github.com/percona/mongodb-backup/internal/oplog.(*OplogTail).tail()"
iter := col.Find(ot.tailQuery(session)).LogReplay().Comment(comment).Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
iter := col.Find(ot.tailQuery()).LogReplay().Comment(comment).Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
for {
select {
case <-ot.stopChan:
Expand Down Expand Up @@ -157,18 +157,18 @@ func (ot *OplogTail) tail(session *mgo.Session) {
if iter.Err() != nil {
iter.Close()
}
iter = col.Find(ot.tailQuery(session)).LogReplay().Comment(comment).Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
iter = col.Find(ot.tailQuery()).LogReplay().Comment(comment).Batch(mgoIterBatch).Prefetch(mgoIterPrefetch).Iter()
}
}

func (ot *OplogTail) tailQuery(session *mgo.Session) 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 {
isMasterDoc, err := getIsMaster(session)
isMasterDoc, err := getIsMaster(ot.session)
if err != nil {
mongoTimestamp, _ := bson.NewMongoTimestamp(time.Now(), 0)
query["ts"] = bson.M{"$gte": mongoTimestamp}
Expand Down