remove blockGCUntil

pingcap · Mar 28, 2024 · 726f77a · 726f77a
1 parent 168aa45
commit 726f77a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 32 deletions.
diff --git a/br/pkg/streamhelper/advancer.go b/br/pkg/streamhelper/advancer.go
@@ -588,20 +588,6 @@ func (c *CheckpointAdvancer) importantTick(ctx context.Context) error {
 		}
 		return errors.Annotate(errors.Errorf("check point lagged too large"), "check point lagged too large")
 	}
-	p, err := c.env.BlockGCUntil(ctx, c.lastCheckpoint.safeTS())
-	if err != nil {
-		return errors.Annotatef(err,
-			"failed to update service GC safe point, current checkpoint is %d, target checkpoint is %d",
-			c.lastCheckpoint.safeTS(), p)
-	}
-	if p <= c.lastCheckpoint.safeTS() {
-		log.Info("updated log backup GC safe point.",
-			zap.Uint64("checkpoint", p), zap.Uint64("target", c.lastCheckpoint.safeTS()))
-	}
-	if p > c.lastCheckpoint.safeTS() {
-		log.Warn("update log backup GC safe point failed: stale.",
-			zap.Uint64("checkpoint", p), zap.Uint64("target", c.lastCheckpoint.safeTS()))
-	}
 	return nil
 }
 

diff --git a/br/pkg/streamhelper/advancer_env.go b/br/pkg/streamhelper/advancer_env.go
@@ -8,8 +8,8 @@ import (
 
 	logbackup "github.com/pingcap/kvproto/pkg/logbackuppb"
 	"github.com/pingcap/tidb/br/pkg/utils"
-	"github.com/pingcap/tidb/pkg/config"
-	"github.com/pingcap/tidb/pkg/util/engine"
+	"github.com/pingcap/tidb/config"
+	"github.com/pingcap/tidb/util/engine"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/txnkv/txnlock"
@@ -37,13 +37,6 @@ type PDRegionScanner struct {
 	pd.Client
 }
 
-// Updates the service GC safe point for the cluster.
-// Returns the minimal service GC safe point across all services.
-// If the arguments is `0`, this would remove the service safe point.
-func (c PDRegionScanner) BlockGCUntil(ctx context.Context, at uint64) (uint64, error) {
-	return c.UpdateServiceGCSafePoint(ctx, logBackupServiceID, int64(logBackupSafePointTTL.Seconds()), at)
-}
-
 // TODO: It should be able to synchoronize the current TS with the PD.
 func (c PDRegionScanner) FetchCurrentTS(ctx context.Context) (uint64, error) {
 	return oracle.ComposeTS(time.Now().UnixMilli(), 0), nil

diff --git a/br/pkg/streamhelper/basic_lib_for_test.go b/br/pkg/streamhelper/basic_lib_for_test.go
@@ -26,8 +26,8 @@ import (
 	"github.com/pingcap/tidb/br/pkg/streamhelper"
 	"github.com/pingcap/tidb/br/pkg/streamhelper/spans"
 	"github.com/pingcap/tidb/br/pkg/utils"
-	"github.com/pingcap/tidb/pkg/kv"
-	"github.com/pingcap/tidb/pkg/util/codec"
+	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/util/codec"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/tikvrpc"

diff --git a/br/pkg/streamhelper/regioniter.go b/br/pkg/streamhelper/regioniter.go
@@ -36,13 +36,6 @@ type TiKVClusterMeta interface {
 	// Stores returns the store metadata from the cluster.
 	Stores(ctx context.Context) ([]Store, error)
 
-	// Updates the service GC safe point for the cluster.
-	// Returns the latest service GC safe point.
-	// If the arguments is `0`, this would remove the service safe point.
-	// NOTE: once we support multi tasks, perhaps we need to allow the caller to provide a namespace.
-	// For now, all tasks (exactly one task in fact) use the same checkpoint.
-	BlockGCUntil(ctx context.Context, at uint64) (uint64, error)
-
 	FetchCurrentTS(ctx context.Context) (uint64, error)
 }