Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: move out replication and syncer #6418

Merged
merged 2 commits into from
May 29, 2023
Merged

*: move out replication and syncer #6418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78f8c95
move out replication and syncer
rleungx May 26, 2023
b46e00b
Merge branch 'master' into refactor-coordinator
ti-chi-bot[bot] May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 server/replication/metrics.go → pkg/replication/metrics.go
View file
Open in desktop
File renamed without changes.
0 server/replication/replication_mode.go → pkg/replication/replication_mode.go
View file
Open in desktop
File renamed without changes.
0 server/replication/replication_mode_test.go → pkg/replication/replication_mode_test.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/client.go → pkg/syncer/client.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/client_test.go → pkg/syncer/client_test.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/history_buffer.go → pkg/syncer/history_buffer.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/history_buffer_test.go → pkg/syncer/history_buffer_test.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/metrics.go → pkg/syncer/metrics.go
View file
Open in desktop
File renamed without changes.
0 server/regionsyncer/server.go → pkg/syncer/server.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions server/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/server/cluster/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/server/region_syncer/region_syncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This issue may not be related to this PR change. The old path github.com/tikv/pd/server/syncer/noFastExitSync seems to be wrong? Should be regionsyncer other than syncer. So does this failpoint work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The package name is syncer I think.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get

re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/syncer/noFastExitSync"))
re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/storage/regionStorageFastFlush"))
}

Expand Down