Merge branch 'master' into balance-witness

pkg/mcs/docs.go

@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package msc used to implement the core logic of the external services which rely on the PD banckend provider.
+// Package msc used to implement the core logic of the external services which rely on the PD backend provider.
 package msc

pkg/mcs/registry/registry.go

@@ -41,7 +41,7 @@ type RegistrableService interface {
 }
 
 // ServiceRegistry is a map that stores all registered grpc services.
-// It implements the `Serviceregistry` interface.
+// It implements the `ServiceRegistry` interface.
 type ServiceRegistry struct {
 	builders map[string]ServiceBuilder
 	services map[string]RegistrableService
@@ -90,7 +90,7 @@ func (r ServiceRegistry) RegisterService(name string, service ServiceBuilder) {
 }
 
 func init() {
-	server.NewServiceregistry = func() server.Serviceregistry {
+	server.NewServiceRegistry = func() server.ServiceRegistry {
 		return ServerServiceRegistry
 	}
 }

pkg/mcs/resource_manager/server/apis/v1/api.go

@@ -75,7 +75,7 @@ func NewService(srv *rmserver.Service) *Service {
 func (s *Service) RegisterRouter() {
 	configEndpoint := s.baseEndpoint.Group("/config")
 	configEndpoint.POST("/group", s.postResourceGroup)
-	configEndpoint.PUT("group", s.putResourceGroup)
+	configEndpoint.PUT("/group", s.putResourceGroup)
 	configEndpoint.GET("/group/:name", s.getResourceGroup)
 	configEndpoint.GET("/groups", s.getResourceGroupList)
 	configEndpoint.DELETE("/group/:name", s.deleteResourceGroup)

pkg/mcs/resource_manager/server/grpc_service.go

@@ -63,8 +63,8 @@ func (s *Service) RegisterGRPCService(g *grpc.Server) {
 
 // RegisterRESTHandler registers the service to REST server.
 func (s *Service) RegisterRESTHandler(userDefineHandlers map[string]http.Handler) {
-	hander, group := SetUpRestHandler(s)
-	server.RegisterUserDefinedHandlers(userDefineHandlers, &group, hander)
+	handler, group := SetUpRestHandler(s)
+	server.RegisterUserDefinedHandlers(userDefineHandlers, &group, handler)
 }
 
 // GetManager returns the resource manager.

pkg/mcs/resource_manager/server/install/install.go

@@ -18,7 +18,7 @@ import (
 	"github.com/tikv/pd/pkg/mcs/registry"
 	rm_server "github.com/tikv/pd/pkg/mcs/resource_manager/server"
 
-	// init API gorup
+	// init API group
 	_ "github.com/tikv/pd/pkg/mcs/resource_manager/server/apis/v1"
 )
 

server/schedule/checker/checker_controller.go

@@ -50,7 +50,6 @@ type Controller struct {
 }
 
 // NewController create a new Controller.
-// TODO: isSupportMerge should be removed.
 func NewController(ctx context.Context, cluster schedule.Cluster, ruleManager *placement.RuleManager, labeler *labeler.RegionLabeler, opController *schedule.OperatorController) *Controller {
 	regionWaitingList := cache.NewDefaultCache(DefaultCacheSize)
 	return &Controller{

server/server.go

@@ -223,7 +223,7 @@ func CreateServer(ctx context.Context, cfg *config.Config, legacyServiceBuilders
 		etcdCfg.UserHandlers = userHandlers
 	}
 	// New way to register services.
-	registry := NewServiceregistry()
+	registry := NewServiceRegistry()
 
 	// Register the micro services REST path.
 	registry.InstallAllRESTHandler(s, etcdCfg.UserHandlers)

server/util.go

@@ -166,23 +166,23 @@ func checkBootstrapRequest(clusterID uint64, req *pdpb.BootstrapRequest) error {
 
 /// REST API and GRPC services relative Utils.
 
-// Serviceregistry used to install the registered services, including gRPC and HTTP API.
-type Serviceregistry interface {
+// ServiceRegistry used to install the registered services, including gRPC and HTTP API.
+type ServiceRegistry interface {
 	InstallAllGRPCServices(srv *Server, g *grpc.Server)
 	InstallAllRESTHandler(srv *Server, userDefineHandler map[string]http.Handler)
 }
 
-// NewServiceregistry is a hook for msc code which implements the micro service.
-var NewServiceregistry = func() Serviceregistry {
-	return dummyServiceregistry{}
+// NewServiceRegistry is a hook for msc code which implements the micro service.
+var NewServiceRegistry = func() ServiceRegistry {
+	return dummyServiceRegistry{}
 }
 
-type dummyServiceregistry struct{}
+type dummyServiceRegistry struct{}
 
-func (d dummyServiceregistry) InstallAllGRPCServices(srv *Server, g *grpc.Server) {
+func (d dummyServiceRegistry) InstallAllGRPCServices(srv *Server, g *grpc.Server) {
 }
 
-func (d dummyServiceregistry) InstallAllRESTHandler(srv *Server, userDefineHandler map[string]http.Handler) {
+func (d dummyServiceRegistry) InstallAllRESTHandler(srv *Server, userDefineHandler map[string]http.Handler) {
 }
 
 // APIServiceGroup used to register the HTTP REST API.

tests/registry/registry_test.go

@@ -43,13 +43,13 @@ func (t *testServiceRegistry) RegisterRESTHandler(userDefineHandlers map[string]
 	server.RegisterUserDefinedHandlers(userDefineHandlers, &group, handler)
 }
 
-func newtestServiceRegistry(_ *server.Server) registry.RegistrableService {
+func newTestServiceRegistry(_ *server.Server) registry.RegistrableService {
 	return &testServiceRegistry{}
 }
 
 func install(register *registry.ServiceRegistry) {
-	register.RegisterService("test", newtestServiceRegistry)
-	server.NewServiceregistry = func() server.Serviceregistry {
+	register.RegisterService("test", newTestServiceRegistry)
+	server.NewServiceRegistry = func() server.ServiceRegistry {
 		return register
 	}
 }