Skip to content

Commit 1d85eee

Browse files
XiaochenCuitbg
authored andcommitted
kvserver: remove StoreBenignError
Before commit 3f0b37a, the StoreBenignError is used to handle pebble.ErrSnapshotExcised. As the latter has been removed from pebble, we don't need StoreBenignError anymore. This commit does the following: - Remove type "StoreBenignError". - Remove the related increase action on counter "storeFailures". - Update related tests "TestBaseQueueRequeue". Fixes: #129941 Release note: None
1 parent 2729738 commit 1d85eee

File tree

4 files changed

+1
-51
lines changed

4 files changed

+1
-51
lines changed

Diff for: pkg/kv/kvserver/benignerror/BUILD.bazel

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
44
name = "benignerror",
5-
srcs = [
6-
"benign_error.go",
7-
"store_benign_error.go",
8-
],
5+
srcs = ["benign_error.go"],
96
importpath = "github.com/cockroachdb/cockroach/pkg/kv/kvserver/benignerror",
107
visibility = ["//visibility:public"],
118
deps = ["@com_github_cockroachdb_errors//:errors"],

Diff for: pkg/kv/kvserver/benignerror/store_benign_error.go

-27
This file was deleted.

Diff for: pkg/kv/kvserver/queue.go

-5
Original file line numberDiff line numberDiff line change
@@ -1170,17 +1170,12 @@ func (bq *baseQueue) finishProcessingReplica(
11701170
// Handle failures.
11711171
if err != nil {
11721172
benign := benignerror.IsBenign(err)
1173-
storeBenign := benignerror.IsStoreBenign(err)
11741173

11751174
// Increment failures metric.
11761175
//
11771176
// TODO(tschottdorf): once we start asserting zero failures in tests
11781177
// (and production), move benign failures into a dedicated category.
11791178
bq.failures.Inc(1)
1180-
if storeBenign {
1181-
bq.storeFailures.Inc(1)
1182-
requeue = true
1183-
}
11841179

11851180
// Determine whether a failure is a purgatory error. If it is, add
11861181
// the failing replica to purgatory. Note that even if the item was

Diff for: pkg/kv/kvserver/queue_test.go

-15
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/config"
1919
"github.com/cockroachdb/cockroach/pkg/config/zonepb"
2020
"github.com/cockroachdb/cockroach/pkg/keys"
21-
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/benignerror"
2221
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase"
2322
"github.com/cockroachdb/cockroach/pkg/roachpb"
2423
"github.com/cockroachdb/cockroach/pkg/settings"
@@ -1559,18 +1558,4 @@ func TestBaseQueueRequeue(t *testing.T) {
15591558
bq.maybeAdd(ctx, r1, hlc.ClockTimestamp{})
15601559
assertShouldQueueCount(6)
15611560
assertProcessedAndProcessing(2, 0)
1562-
1563-
// Reset shouldQueueCount so we actually process the replica. Then return
1564-
// a StoreBenign error. It should requeue the replica.
1565-
atomic.StoreInt64(&shouldQueueCount, 0)
1566-
pQueue.err = benignerror.NewStoreBenign(errors.New("test"))
1567-
bq.maybeAdd(ctx, r1, hlc.ClockTimestamp{})
1568-
assertShouldQueueCount(1)
1569-
assertProcessedAndProcessing(2, 1)
1570-
// Let the first processing attempt finish. It should requeue.
1571-
pQueue.processBlocker <- struct{}{}
1572-
assertProcessedAndProcessing(3, 1)
1573-
pQueue.err = nil
1574-
pQueue.processBlocker <- struct{}{}
1575-
assertProcessedAndProcessing(4, 0)
15761561
}

0 commit comments

Comments
 (0)