@@ -90,8 +90,8 @@ type Verifier struct {
9090 metaClient * mongo.Client
9191 srcClient * mongo.Client
9292 dstClient * mongo.Client
93- srcBuildInfo * util.BuildInfo
94- dstBuildInfo * util.BuildInfo
93+ srcClusterInfo * util.ClusterInfo
94+ dstClusterInfo * util.ClusterInfo
9595 numWorkers int
9696 failureDisplaySize int64
9797
@@ -187,13 +187,18 @@ type VerifierSettings struct {
187187}
188188
189189// NewVerifier creates a new Verifier
190- func NewVerifier (settings VerifierSettings ) * Verifier {
190+ func NewVerifier (settings VerifierSettings , logPath string ) * Verifier {
191191 readConcern := settings .ReadConcernSetting
192192 if readConcern == "" {
193193 readConcern = ReadConcernMajority
194194 }
195195
196+ logger , logWriter := getLoggerAndWriter (logPath )
197+
196198 return & Verifier {
199+ logger : logger ,
200+ writer : logWriter ,
201+
197202 phase : Idle ,
198203 numWorkers : NumWorkers ,
199204 readPreference : readpref .Primary (),
@@ -311,40 +316,6 @@ func (verifier *Verifier) AddMetaIndexes(ctx context.Context) error {
311316 return err
312317}
313318
314- func (verifier * Verifier ) SetSrcURI (ctx context.Context , uri string ) error {
315- opts := verifier .getClientOpts (uri )
316- var err error
317- verifier .srcClient , err = mongo .Connect (ctx , opts )
318- if err != nil {
319- return errors .Wrapf (err , "failed to connect to source %#q" , uri )
320- }
321-
322- buildInfo , err := util .GetBuildInfo (ctx , verifier .srcClient )
323- if err != nil {
324- return errors .Wrap (err , "failed to read source build info" )
325- }
326-
327- verifier .srcBuildInfo = & buildInfo
328- return nil
329- }
330-
331- func (verifier * Verifier ) SetDstURI (ctx context.Context , uri string ) error {
332- opts := verifier .getClientOpts (uri )
333- var err error
334- verifier .dstClient , err = mongo .Connect (ctx , opts )
335- if err != nil {
336- return errors .Wrapf (err , "failed to connect to destination %#q" , uri )
337- }
338-
339- buildInfo , err := util .GetBuildInfo (ctx , verifier .dstClient )
340- if err != nil {
341- return errors .Wrap (err , "failed to read destination build info" )
342- }
343-
344- verifier .dstBuildInfo = & buildInfo
345- return nil
346- }
347-
348319func (verifier * Verifier ) SetServerPort (port int ) {
349320 verifier .port = port
350321}
@@ -366,10 +337,6 @@ func (verifier *Verifier) SetPartitionSizeMB(partitionSizeMB uint32) {
366337 verifier .partitionSizeInBytes = int64 (partitionSizeMB ) * 1024 * 1024
367338}
368339
369- func (verifier * Verifier ) SetLogger (logPath string ) {
370- verifier .logger , verifier .writer = getLoggerAndWriter (logPath )
371- }
372-
373340func (verifier * Verifier ) SetSrcNamespaces (arg []string ) {
374341 verifier .srcNamespaces = arg
375342}
@@ -473,7 +440,7 @@ func (verifier *Verifier) maybeAppendGlobalFilterToPredicates(predicates bson.A)
473440 return append (predicates , verifier .globalFilter )
474441}
475442
476- func (verifier * Verifier ) getDocumentsCursor (ctx context.Context , collection * mongo.Collection , buildInfo * util.BuildInfo ,
443+ func (verifier * Verifier ) getDocumentsCursor (ctx context.Context , collection * mongo.Collection , clusterInfo * util.ClusterInfo ,
477444 startAtTs * primitive.Timestamp , task * VerificationTask ) (* mongo.Cursor , error ) {
478445 var findOptions bson.D
479446 runCommandOptions := options .RunCmd ()
@@ -486,7 +453,7 @@ func (verifier *Verifier) getDocumentsCursor(ctx context.Context, collection *mo
486453 bson.E {"filter" , bson.D {{"$and" , andPredicates }}},
487454 }
488455 } else {
489- findOptions = task .QueryFilter .Partition .GetFindOptions (buildInfo , verifier .maybeAppendGlobalFilterToPredicates (andPredicates ))
456+ findOptions = task .QueryFilter .Partition .GetFindOptions (clusterInfo , verifier .maybeAppendGlobalFilterToPredicates (andPredicates ))
490457 }
491458 if verifier .readPreference .Mode () != readpref .PrimaryMode {
492459 runCommandOptions = runCommandOptions .SetReadPreference (verifier .readPreference )
0 commit comments