Merge remote-tracking branch 'origin/main' into CBG-4267

Author: torcolvin

db/active_replicator.go

@@ -222,12 +222,14 @@ func connect(arc *activeReplicatorCommon, idSuffix string) (blipSender *blip.Sen
 	cancelCtx, cancelFunc := context.WithCancel(context.WithoutCancel(ctx)) // separate cancel context from parent cancel context
 
 	var originPatterns []string // no origin headers for ISGR
+	var blipContext *blip.Context
+
 	// NewSGBlipContext doesn't set cancellation context - active replication cancellation on db close is handled independently
-	// TODO: CBG-3661 ActiveReplicator subprotocol versions
-	// - make this configurable for testing mixed-version replications
-	// - if unspecified, default to v2 and v3 until VV is supported with ISGR, then also include v4
-	protocols := []string{CBMobileReplicationV3.SubprotocolString(), CBMobileReplicationV2.SubprotocolString()}
-	ctx, blipContext, err := NewSGBlipContextWithProtocols(ctx, arc.config.ID+idSuffix, originPatterns, protocols, cancelCtx)
+	if len(arc.config.SupportedBLIPProtocols) > 0 {
+		ctx, blipContext, err = NewSGBlipContextWithProtocols(ctx, arc.config.ID+idSuffix, originPatterns, arc.config.SupportedBLIPProtocols, cancelCtx)
+	} else {
+		ctx, blipContext, err = NewSGBlipContext(ctx, arc.config.ID+idSuffix, originPatterns, cancelCtx)
+	}
 	if err != nil {
 		cancelFunc()
 		return nil, nil, err

db/active_replicator_common.go

@@ -123,6 +123,8 @@ func newActiveReplicatorCommon(ctx context.Context, config *ActiveReplicatorConf
 		statusKey:        metakeys.ReplicationStatusKey(checkpointID),
 		direction:        direction,
 	}
+	// CBG-4780: WIll hard code to use < 4 protocols for now, as the ISGR doesn't support 4+ protocols.
+	arc.config.SupportedBLIPProtocols = []string{CBMobileReplicationV3.SubprotocolString(), CBMobileReplicationV2.SubprotocolString()}
 
 	if config.CollectionsEnabled {
 		arc.namedCollections = make(map[base.ScopeAndCollectionName]*activeReplicatorCollection)

db/active_replicator_config.go

@@ -114,6 +114,9 @@ type ActiveReplicatorConfig struct {
 	// Returns an error from ActiveReplicator.Stop() if the replicator encountered any recovered panics inside handlers.
 	// Intended for test usage only, enabled by default but disabled for the prod-ISGR codepath.
 	reportHandlerPanicsOnStop *bool
+
+	// SupportedBLIPProtocols is a list of BLIP protocols supported by the active replicator.
+	SupportedBLIPProtocols []string
 }
 
 // SetCheckpointPrefix is a cross-package way of defining a checkpoint prefix for an ActiveReplicatorConfig intended for test usage.

rest/attachment_test.go

@@ -2390,66 +2390,6 @@ func TestPushUnknownAttachmentAsStub(t *testing.T) {
 	})
 }
 
-func TestMinRevPosWorkToAvoidUnnecessaryProveAttachment(t *testing.T) {
-	rtConfig := &RestTesterConfig{
-		GuestEnabled: true,
-		DatabaseConfig: &DatabaseConfig{
-			DbConfig: DbConfig{
-				AllowConflicts: base.Ptr(true),
-			},
-		},
-	}
-
-	btcRunner := NewBlipTesterClientRunner(t)
-	const docID = "doc"
-
-	btcRunner.Run(func(t *testing.T, SupportedBLIPProtocols []string) {
-		rt := NewRestTester(t, rtConfig)
-		defer rt.Close()
-
-		opts := BlipTesterClientOpts{SupportedBLIPProtocols: SupportedBLIPProtocols}
-		btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, &opts)
-		defer btc.Close()
-
-		btcRunner.StartPull(btc.id)
-
-		// Push an initial rev with attachment data
-		initialVersion := rt.PutDocWithAttachment(docID, "{}", "hello.txt", "aGVsbG8gd29ybGQ=")
-		rt.WaitForPendingChanges()
-
-		// Replicate data to client and ensure doc arrives
-		rt.WaitForPendingChanges()
-		btcRunner.WaitForVersion(btc.id, docID, initialVersion)
-
-		// Create a set of revisions before we start the replicator to ensure there's a significant amount of history to push
-		version := initialVersion
-		for i := 0; i < 25; i++ {
-			version = btcRunner.AddRev(btc.id, docID, &version, []byte(`{"update_count":`+strconv.Itoa(i)+`,"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`))
-		}
-
-		// Note this references revpos 1 and therefore SGW has it - Shouldn't need proveAttachment, even when we replicate it
-		proveAttachmentBefore := btc.pushReplication.replicationStats.ProveAttachment.Value()
-		btcRunner.StartPushWithOpts(btc.id, BlipTesterPushOptions{Continuous: false})
-		rt.WaitForVersion(docID, version)
-
-		proveAttachmentAfter := btc.pushReplication.replicationStats.ProveAttachment.Value()
-		assert.Equal(t, proveAttachmentBefore, proveAttachmentAfter)
-
-		// start another push to run in the background from where we last left off
-		latestSeq := btcRunner.SingleCollection(btc.id).lastSeq()
-		btcRunner.StartPushWithOpts(btc.id, BlipTesterPushOptions{Continuous: true, Since: strconv.Itoa(int(latestSeq))})
-
-		// Push another bunch of history, this time whilst a replicator is actively pushing them
-		for i := 25; i < 50; i++ {
-			version = btcRunner.AddRev(btc.id, docID, &version, []byte(`{"update_count":`+strconv.Itoa(i)+`,"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`))
-		}
-
-		rt.WaitForVersion(docID, version)
-		proveAttachmentAfter = btc.pushReplication.replicationStats.ProveAttachment.Value()
-		assert.Equal(t, proveAttachmentBefore, proveAttachmentAfter)
-	})
-}
-
 func TestAttachmentWithErroneousRevPos(t *testing.T) {
 	rtConfig := &RestTesterConfig{
 		GuestEnabled: true,

rest/utilities_testing_blip_client.go

@@ -956,12 +956,6 @@ func (btcc *BlipTesterCollectionClient) updateLastReplicatedRev(docID string, ve
 	rev.message = msg
 }
 
-func (c *BlipTesterCollectionClient) lastSeq() clientSeq {
-	c.seqLock.RLock()
-	defer c.seqLock.RUnlock()
-	return c._seqLast
-}
-
 func newBlipTesterReplication(tb testing.TB, id string, btc *BlipTesterClient, skipCollectionsInitialization bool) *BlipTesterReplicator {
 	bt, err := NewBlipTesterFromSpecWithRT(tb, &BlipTesterSpec{
 		connectingPassword:            RestTesterDefaultUserPassword,