remove binding

apecloud · Oct 25, 2023 · efe6cad · efe6cad
1 parent a8c131a
commit efe6cad
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 2,839 deletions.
diff --git a/cmd/lorry/main.go b/cmd/lorry/main.go
@@ -21,6 +21,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"os"
 	"os/signal"
 	"strings"
@@ -35,6 +36,7 @@ import (
 
 	"github.com/apecloud/kubeblocks/lorry/dcs"
 	"github.com/apecloud/kubeblocks/lorry/engines/register"
+	"github.com/apecloud/kubeblocks/lorry/grpcserver"
 	"github.com/apecloud/kubeblocks/lorry/highavailability"
 	"github.com/apecloud/kubeblocks/lorry/httpserver"
 	opsregister "github.com/apecloud/kubeblocks/lorry/operations/register"
@@ -43,18 +45,8 @@ import (
 	viper "github.com/apecloud/kubeblocks/pkg/viperx"
 )
 
-var (
-	grpcPort int
-)
-
-const (
-	DefaultGRPCPort = 50001
-)
-
 func init() {
 	viper.AutomaticEnv()
-	viper.SetDefault(constant.KBEnvCharacterType, "custom")
-	flag.IntVar(&grpcPort, "grpcport", DefaultGRPCPort, "lorry grpc default port")
 }
 
 func main() {
@@ -103,20 +95,15 @@ func main() {
 		}
 	}
 
-	// // start grpc server for role probe
-	// listen, err := net.Listen("tcp", fmt.Sprintf(":%d", grpcPort))
-	// if err != nil {
-	// 	panic(fmt.Errorf("fatal error listen on port %d: %v", grpcPort, err))
-	// }
-
-	// healthServer := customgrpc.NewGRPCServer()
-	// server := grpc.NewServer()
-	// health.RegisterHealthServer(server, healthServer)
-
-	// err = server.Serve(listen)
-	// if err != nil {
-	// 	panic(fmt.Errorf("fatal error grpcserver serve failed: %v", err))
-	// }
+	// start grpc server for role probe
+	grpcServer, err := grpcserver.NewGRPCServer()
+	if err != nil {
+		panic(fmt.Errorf("fatal error grpcserver create failed: %v", err))
+	}
+	err = grpcServer.StartNonBlocking()
+	if err != nil {
+		panic(fmt.Errorf("fatal error grpcserver serve failed: %v", err))
+	}
 
 	// Start HTTP Server
 	ops := opsregister.Operations()

diff --git a/go.mod b/go.mod
@@ -47,7 +47,6 @@ require (
 	github.com/hashicorp/terraform-exec v0.18.0
 	github.com/jackc/pgx/v5 v5.4.3
 	github.com/jedib0t/go-pretty/v6 v6.4.6
-	github.com/json-iterator/go v1.1.12
 	github.com/k3d-io/k3d/v5 v5.6.0
 	github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
@@ -265,6 +264,7 @@ require (
 	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.16.6 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect