Merge remote-tracking branch 'couchbase/unstable' into HEAD

Change-Id: Ia78b31e2cbee49e59361a9abfa3ecd98bd864a59
couchbase · Feb 17, 2022 · fac3ce2 · fac3ce2
2 parents 76101bd + 747cf42
commit fac3ce2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/consumer/checkpoint.go b/consumer/checkpoint.go
@@ -165,9 +165,7 @@ func (c *Consumer) isVbIdle(vbno uint16, checkpointTime *time.Time) bool {
 	currentTime := time.Now()
 	if checkpointTime.IsZero() == false &&
 		currentTime.Sub(*checkpointTime) < c.idleCheckpointInterval &&
-		c.backupVbStats.getVbStat(vbno, "last_processed_seq_no").(uint64) == c.vbProcessingStats.getVbStat(vbno, "last_processed_seq_no").(uint64) &&
-		c.backupVbStats.getVbStat(vbno, "last_doc_timer_feedback_seqno").(uint64) == c.vbProcessingStats.getVbStat(vbno, "last_doc_timer_feedback_seqno").(uint64) &&
-		c.backupVbStats.getVbStat(vbno, "sent_to_worker_counter").(uint64) == c.vbProcessingStats.getVbStat(vbno, "sent_to_worker_counter").(uint64) {
+		c.backupVbStats.getVbStat(vbno, "last_processed_seq_no").(uint64) == c.vbProcessingStats.getVbStat(vbno, "last_processed_seq_no").(uint64) {
 		return true
 	}
 	*checkpointTime = currentTime

diff --git a/producer/depcfg_parser.go b/producer/depcfg_parser.go
@@ -205,7 +205,7 @@ func (p *Producer) parseDepcfg() error {
 	if val, ok := settings["idle_checkpoint_interval"]; ok {
 		p.handlerConfig.IdleCheckpointInterval = int(val.(float64))
 	} else {
-		p.handlerConfig.IdleCheckpointInterval = 30000
+		p.handlerConfig.IdleCheckpointInterval = 1800000
 	}
 
 	if val, ok := settings["log_level"]; ok {