Refactor datanode main

Signed-off-by: XuanYang-cn <xuan.yang@zilliz.com>
pull/4973/head^2
XuanYang-cn 2021-01-30 16:22:28 +08:00 committed by yefu.chen
parent 3573e01093
commit d5346e132a
2 changed files with 149 additions and 118 deletions

View File

@ -6,118 +6,23 @@ import (
"os"
"os/signal"
"syscall"
"time"
dn "github.com/zilliztech/milvus-distributed/internal/datanode"
dnc "github.com/zilliztech/milvus-distributed/internal/distributed/datanode"
dsc "github.com/zilliztech/milvus-distributed/internal/distributed/dataservice"
msc "github.com/zilliztech/milvus-distributed/internal/distributed/masterservice"
ms "github.com/zilliztech/milvus-distributed/internal/masterservice"
"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
"github.com/zilliztech/milvus-distributed/internal/proto/internalpb2"
distributed "github.com/zilliztech/milvus-distributed/cmd/distributed/components"
)
const retry = 10
const interval = 200
func main() {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
svr, err := dnc.New(ctx)
dn, err := distributed.NewDataNode(ctx)
if err != nil {
panic(err)
}
log.Println("Datanode is", dn.Params.NodeID)
// --- Master Service Client ---
ms.Params.Init()
log.Println("Master service address:", dn.Params.MasterAddress)
log.Println("Init master service client ...")
masterClient, err := msc.NewGrpcClient(dn.Params.MasterAddress, 20*time.Second)
if err != nil {
if err = dn.Run(); err != nil {
panic(err)
}
if err = masterClient.Init(); err != nil {
panic(err)
}
if err = masterClient.Start(); err != nil {
panic(err)
}
var cnt int
for cnt = 0; cnt < retry; cnt++ {
time.Sleep(time.Duration(cnt*interval) * time.Millisecond)
if cnt != 0 {
log.Println("Master service isn't ready ...")
log.Printf("Retrying getting master service's states in ... %v ms", interval)
}
msStates, err := masterClient.GetComponentStates()
if err != nil {
continue
}
if msStates.Status.ErrorCode != commonpb.ErrorCode_SUCCESS {
continue
}
if msStates.State.StateCode != internalpb2.StateCode_HEALTHY {
continue
}
break
}
if cnt >= retry {
panic("Master service isn't ready")
}
if err := svr.SetMasterServiceInterface(masterClient); err != nil {
panic(err)
}
// --- Data Service Client ---
log.Println("Data service address: ", dn.Params.ServiceAddress)
log.Println("Init data service client ...")
dataService := dsc.NewClient(dn.Params.ServiceAddress)
if err = dataService.Init(); err != nil {
panic(err)
}
if err = dataService.Start(); err != nil {
panic(err)
}
for cnt = 0; cnt < retry; cnt++ {
dsStates, err := dataService.GetComponentStates()
if err != nil {
continue
}
if dsStates.Status.ErrorCode != commonpb.ErrorCode_SUCCESS {
continue
}
if dsStates.State.StateCode != internalpb2.StateCode_INITIALIZING && dsStates.State.StateCode != internalpb2.StateCode_HEALTHY {
continue
}
break
}
if cnt >= retry {
panic("Data service isn't ready")
}
if err := svr.SetDataServiceInterface(dataService); err != nil {
panic(err)
}
if err := svr.Init(); err != nil {
panic(err)
}
if err := svr.Start(); err != nil {
panic(err)
}
log.Println("Data node successfully started ...")
sc := make(chan os.Signal, 1)
signal.Notify(sc,
syscall.SIGHUP,
@ -125,27 +30,11 @@ func main() {
syscall.SIGTERM,
syscall.SIGQUIT)
var sig os.Signal
go func() {
sig = <-sc
cancel()
}()
<-ctx.Done()
sig := <-sc
log.Println("Got signal to exit signal:", sig.String())
if err := svr.Stop(); err != nil {
err = dn.Stop()
if err != nil {
panic(err)
}
switch sig {
case syscall.SIGTERM:
exit(0)
default:
exit(1)
}
}
func exit(code int) {
os.Exit(code)
}

View File

@ -0,0 +1,142 @@
package components
import (
"context"
"log"
"time"
dn "github.com/zilliztech/milvus-distributed/internal/datanode"
ms "github.com/zilliztech/milvus-distributed/internal/masterservice"
dnc "github.com/zilliztech/milvus-distributed/internal/distributed/datanode"
dsc "github.com/zilliztech/milvus-distributed/internal/distributed/dataservice"
msc "github.com/zilliztech/milvus-distributed/internal/distributed/masterservice"
"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
"github.com/zilliztech/milvus-distributed/internal/proto/internalpb2"
)
type DataNode struct {
ctx context.Context
svr *dnc.Server
masterService *msc.GrpcClient
dataService *dsc.Client
}
func NewDataNode(ctx context.Context) (*DataNode, error) {
const retry = 10
const interval = 200
svr, err := dnc.New(ctx)
if err != nil {
panic(err)
}
log.Println("Datanode is", dn.Params.NodeID)
// --- Master Service Client ---
ms.Params.Init()
log.Println("Master service address:", dn.Params.MasterAddress)
log.Println("Init master service client ...")
masterClient, err := msc.NewGrpcClient(dn.Params.MasterAddress, 20*time.Second)
if err != nil {
panic(err)
}
if err = masterClient.Init(); err != nil {
panic(err)
}
if err = masterClient.Start(); err != nil {
panic(err)
}
var cnt int
for cnt = 0; cnt < retry; cnt++ {
time.Sleep(time.Duration(cnt*interval) * time.Millisecond)
if cnt != 0 {
log.Println("Master service isn't ready ...")
log.Printf("Retrying getting master service's states in ... %v ms", interval)
}
msStates, err := masterClient.GetComponentStates()
if err != nil {
continue
}
if msStates.Status.ErrorCode != commonpb.ErrorCode_SUCCESS {
continue
}
if msStates.State.StateCode != internalpb2.StateCode_HEALTHY {
continue
}
break
}
if cnt >= retry {
panic("Master service isn't ready")
}
if err := svr.SetMasterServiceInterface(masterClient); err != nil {
panic(err)
}
// --- Data Service Client ---
log.Println("Data service address: ", dn.Params.ServiceAddress)
log.Println("Init data service client ...")
dataService := dsc.NewClient(dn.Params.ServiceAddress)
if err = dataService.Init(); err != nil {
panic(err)
}
if err = dataService.Start(); err != nil {
panic(err)
}
for cnt = 0; cnt < retry; cnt++ {
dsStates, err := dataService.GetComponentStates()
if err != nil {
continue
}
if dsStates.Status.ErrorCode != commonpb.ErrorCode_SUCCESS {
continue
}
if dsStates.State.StateCode != internalpb2.StateCode_INITIALIZING && dsStates.State.StateCode != internalpb2.StateCode_HEALTHY {
continue
}
break
}
if cnt >= retry {
panic("Data service isn't ready")
}
if err := svr.SetDataServiceInterface(dataService); err != nil {
panic(err)
}
return &DataNode{
ctx: ctx,
svr: svr,
dataService: dataService,
masterService: masterClient,
}, nil
}
func (d *DataNode) Run() error {
if err := d.svr.Init(); err != nil {
panic(err)
}
if err := d.svr.Start(); err != nil {
panic(err)
}
log.Println("Data node successfully started ...")
return nil
}
func (d *DataNode) Stop() error {
_ = d.dataService.Stop()
_ = d.masterService.Stop()
return d.svr.Stop()
}