Skip to content

Commit c613f94

Browse files
committed
kvserver: rename ingest -> applyAsIngest
1 parent b2d7f67 commit c613f94

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/kv/kvserver/replica_raftstorage.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ func (r *Replica) applySnapshotRaftMuLocked(
487487
ingestion time.Time
488488
}
489489
log.KvDistribution.Infof(ctx, "applying %s", inSnap)
490-
ingested := true
490+
applyAsIngest := true
491491
defer func(start time.Time) {
492492
var logDetails redact.StringBuilder
493493
logDetails.Printf("total=%0.0fms", timeutil.Since(start).Seconds()*1000)
@@ -503,7 +503,7 @@ func (r *Replica) applySnapshotRaftMuLocked(
503503
logDetails.Printf(" ingestion=%d@%0.0fms", len(inSnap.SSTStorageScratch.SSTs()),
504504
stats.ingestion.Sub(stats.subsumedReplicas).Seconds()*1000)
505505
var appliedAsWriteStr string
506-
if !ingested {
506+
if !applyAsIngest {
507507
appliedAsWriteStr = "as write "
508508
}
509509
log.Infof(ctx, "applied %s %s(%s)", inSnap, appliedAsWriteStr, logDetails)
@@ -580,12 +580,12 @@ func (r *Replica) applySnapshotRaftMuLocked(
580580

581581
if len(inSnap.externalSSTs)+len(inSnap.sharedSSTs) == 0 && /* simple */
582582
inSnap.SSTSize <= snapshotIngestAsWriteThreshold.Get(&st.SV) /* small */ {
583-
ingested = false
583+
applyAsIngest = false
584584
}
585585

586586
var ingestStats pebble.IngestOperationStats
587587
var writeBytes uint64
588-
if ingested {
588+
if applyAsIngest {
589589
exciseSpan := desc.KeySpan().AsRawSpanWithNoLocals()
590590
if ingestStats, err = r.store.TODOEngine().IngestAndExciseFiles(ctx, inSnap.SSTStorageScratch.SSTs(), inSnap.sharedSSTs, inSnap.externalSSTs, exciseSpan); err != nil {
591591
return errors.Wrapf(err, "while ingesting %s and excising %s-%s",

0 commit comments

Comments
 (0)