diff options
| author | Kyle Erf <erf@mongodb.com> | 2015-05-25 20:55:52 -0400 |
|---|---|---|
| committer | Kyle Erf <erf@mongodb.com> | 2015-05-26 22:00:50 -0400 |
| commit | a442b80366fb98cb3e91f71f04824a6a31100dae (patch) | |
| tree | 9d82a963c83d1a8b7c6ef17c855da47622d6eb4d /mongodump | |
| parent | 54b0e452e2188b21a610bef2a3dc73adaae00d65 (diff) | |
| download | mongo-a442b80366fb98cb3e91f71f04824a6a31100dae.tar.gz | |
TOOLS-748 disable socket timeouts in dump and restore
Diffstat (limited to 'mongodump')
| -rw-r--r-- | mongodump/mongodump.go | 6 | ||||
| -rw-r--r-- | mongodump/oplog_dump.go | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mongodump/mongodump.go b/mongodump/mongodump.go index 2e534b394ca..8a55dee296d 100644 --- a/mongodump/mongodump.go +++ b/mongodump/mongodump.go @@ -91,8 +91,8 @@ func (dump *MongoDump) Init() error { if err != nil { return fmt.Errorf("can't create session: %v", err) } - // ensure we allow secondary reads - dump.sessionProvider.SetFlags(db.Monotonic) + // ensure we allow secondary reads and disable TCP timeouts + dump.sessionProvider.SetFlags(db.Monotonic | db.DisableSocketTimeout) dump.isMongos, err = dump.sessionProvider.IsMongos() if err != nil { return err @@ -393,7 +393,6 @@ func (dump *MongoDump) DumpIntent(intent *intents.Intent) error { if err != nil { return err } - session.SetSocketTimeout(0) defer session.Close() // in mgo, setting prefetch = 1.0 causes the driver to make requests for // more results as soon as results are returned. This effectively @@ -526,7 +525,6 @@ func (dump *MongoDump) DumpUsersAndRolesForDB(db string) error { if err != nil { return err } - session.SetSocketTimeout(0) defer session.Close() dbQuery := bson.M{"db": db} diff --git a/mongodump/oplog_dump.go b/mongodump/oplog_dump.go index c9c30b8f1c2..9a7570d5613 100644 --- a/mongodump/oplog_dump.go +++ b/mongodump/oplog_dump.go @@ -73,7 +73,6 @@ func (dump *MongoDump) DumpOplogAfterTimestamp(ts bson.MongoTimestamp) error { return err } defer session.Close() - session.SetSocketTimeout(0) session.SetPrefetch(1.0) // mimic exhaust cursor queryObj := bson.M{"ts": bson.M{"$gt": ts}} oplogQuery := session.DB("local").C(dump.oplogCollection).Find(queryObj).LogReplay() |