Merge branch 'master' into change-primary-path

tikv · May 29, 2023 · 35861b6 · 35861b6
2 parents 0f0efa4 + 778d6aa
commit 35861b6
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 6 deletions.
diff --git a/server/replication/metrics.go → pkg/replication/metrics.go b/server/replication/metrics.go → pkg/replication/metrics.go
diff --git a/server/replication/replication_mode.go → pkg/replication/replication_mode.go b/server/replication/replication_mode.go → pkg/replication/replication_mode.go
diff --git a/server/replication/replication_mode_test.go → pkg/replication/replication_mode_test.go b/server/replication/replication_mode_test.go → pkg/replication/replication_mode_test.go
diff --git a/server/regionsyncer/client.go → pkg/syncer/client.go b/server/regionsyncer/client.go → pkg/syncer/client.go
diff --git a/server/regionsyncer/client_test.go → pkg/syncer/client_test.go b/server/regionsyncer/client_test.go → pkg/syncer/client_test.go
diff --git a/server/regionsyncer/history_buffer.go → pkg/syncer/history_buffer.go b/server/regionsyncer/history_buffer.go → pkg/syncer/history_buffer.go
diff --git a/server/regionsyncer/history_buffer_test.go → pkg/syncer/history_buffer_test.go b/server/regionsyncer/history_buffer_test.go → pkg/syncer/history_buffer_test.go
diff --git a/server/regionsyncer/metrics.go → pkg/syncer/metrics.go b/server/regionsyncer/metrics.go → pkg/syncer/metrics.go
diff --git a/server/regionsyncer/server.go → pkg/syncer/server.go b/server/regionsyncer/server.go → pkg/syncer/server.go
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -39,6 +39,7 @@ import (
 	"github.com/tikv/pd/pkg/keyspace"
 	"github.com/tikv/pd/pkg/memory"
 	"github.com/tikv/pd/pkg/progress"
+	"github.com/tikv/pd/pkg/replication"
 	"github.com/tikv/pd/pkg/schedule"
 	"github.com/tikv/pd/pkg/schedule/checker"
 	sc "github.com/tikv/pd/pkg/schedule/config"
@@ -52,6 +53,7 @@ import (
 	"github.com/tikv/pd/pkg/statistics/buckets"
 	"github.com/tikv/pd/pkg/storage"
 	"github.com/tikv/pd/pkg/storage/endpoint"
+	"github.com/tikv/pd/pkg/syncer"
 	"github.com/tikv/pd/pkg/unsaferecovery"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
@@ -60,8 +62,6 @@ import (
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
-	syncer "github.com/tikv/pd/server/regionsyncer"
-	"github.com/tikv/pd/server/replication"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )

diff --git a/server/server.go b/server/server.go
@@ -63,6 +63,7 @@ import (
 	"github.com/tikv/pd/pkg/storage"
 	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
+	"github.com/tikv/pd/pkg/syncer"
 	"github.com/tikv/pd/pkg/systimemon"
 	"github.com/tikv/pd/pkg/tso"
 	"github.com/tikv/pd/pkg/utils/apiutil"
@@ -75,7 +76,6 @@ import (
 	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"
-	syncer "github.com/tikv/pd/server/regionsyncer"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/mvcc/mvccpb"

diff --git a/tests/server/cluster/cluster_test.go b/tests/server/cluster/cluster_test.go
@@ -37,14 +37,14 @@ import (
 	"github.com/tikv/pd/pkg/mock/mockid"
 	"github.com/tikv/pd/pkg/schedule/operator"
 	"github.com/tikv/pd/pkg/storage"
+	"github.com/tikv/pd/pkg/syncer"
 	"github.com/tikv/pd/pkg/tso"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/utils/tsoutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"
-	syncer "github.com/tikv/pd/server/regionsyncer"
 	"github.com/tikv/pd/tests"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/tests/server/region_syncer/region_syncer_test.go b/tests/server/region_syncer/region_syncer_test.go
@@ -49,7 +49,7 @@ func TestRegionSyncer(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/storage/regionStorageFastFlush", `return(true)`))
-	re.NoError(failpoint.Enable("github.com/tikv/pd/server/syncer/noFastExitSync", `return(true)`))
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/syncer/noFastExitSync", `return(true)`))
 
 	cluster, err := tests.NewTestCluster(ctx, 3, func(conf *config.Config, serverName string) { conf.PDServerCfg.UseRegionStorage = true })
 	defer cluster.Destroy()
@@ -151,7 +151,7 @@ func TestRegionSyncer(t *testing.T) {
 		re.Equal(region.GetLeader(), r.GetLeader())
 		re.Equal(region.GetBuckets(), r.GetBuckets())
 	}
-	re.NoError(failpoint.Disable("github.com/tikv/pd/server/syncer/noFastExitSync"))
+	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/syncer/noFastExitSync"))
 	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/storage/regionStorageFastFlush"))
 }