Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-04 06:54:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加指向nodeId的rpc调用

Browse Source
This commit is contained in:
duanhf2012
2020-03-28 16:51:00 +08:00
parent d66995dd0f
commit d8bb581546
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/cluster.go
View File

@@ -106,14 +106,24 @@ func (slf *Cluster) GetRpcClient(nodeid int) *rpc.Client {
return c.client return c.client
} }
func GetRpcClient(serviceMethod string) ([]*rpc.Client,error) { func GetRpcClient(nodeId int,serviceMethod string) ([]*rpc.Client,error) {
var rpcClientList []*rpc.Client
if nodeId>0 {
pClient := GetCluster().GetRpcClient(nodeId)
if pClient==nil {
return rpcClientList,fmt.Errorf("cannot find nodeid %d!",nodeId)
}
rpcClientList = append(rpcClientList,pClient)
return rpcClientList,nil
}
serviceAndMethod := strings.Split(serviceMethod,".") serviceAndMethod := strings.Split(serviceMethod,".")
if len(serviceAndMethod)!=2 { if len(serviceAndMethod)!=2 {
return nil,fmt.Errorf("servicemethod param %s is error!",serviceMethod) return nil,fmt.Errorf("servicemethod param %s is error!",serviceMethod)
} }
//1.找到对应的rpcnodeid //1.找到对应的rpcnodeid
var rpcClientList []*rpc.Client
nodeidList := GetCluster().GetNodeIdByService(serviceAndMethod[0]) nodeidList := GetCluster().GetNodeIdByService(serviceAndMethod[0])
if len(nodeidList) ==0 { if len(nodeidList) ==0 {
return rpcClientList,fmt.Errorf("Cannot Find %s nodeid",serviceMethod) return rpcClientList,fmt.Errorf("Cannot Find %s nodeid",serviceMethod)

43
rpc/rpchandler.go
View File

@@ -9,7 +9,7 @@ import (
"unicode/utf8" "unicode/utf8"
) )
type FuncRpcClient func(serviceMethod string) ([]*Client,error) type FuncRpcClient func(nodeid int,serviceMethod string) ([]*Client,error)
type FuncRpcServer func() (*Server) type FuncRpcServer func() (*Server)
var NilError = reflect.Zero(reflect.TypeOf((*error)(nil)).Elem()) var NilError = reflect.Zero(reflect.TypeOf((*error)(nil)).Elem())
@@ -212,8 +212,8 @@ func (slf *RpcHandler) CallMethod(ServiceMethod string,param interface{},reply i
return err return err
} }
func (slf *RpcHandler) goRpc(serviceMethod string,mutiCoroutine bool,args interface{}) error { func (slf *RpcHandler) goRpc(nodeId int,serviceMethod string,mutiCoroutine bool,args interface{}) error {
pClientList,err := slf.funcRpcClient(serviceMethod) pClientList,err := slf.funcRpcClient(nodeId,serviceMethod)
if err != nil { if err != nil {
log.Error("Call serviceMethod is error:%+v!",err) log.Error("Call serviceMethod is error:%+v!",err)
return err return err
@@ -250,8 +250,8 @@ func (slf *RpcHandler) goRpc(serviceMethod string,mutiCoroutine bool,args interf
return pCall.Err return pCall.Err
} }
func (slf *RpcHandler) callRpc(serviceMethod string,mutiCoroutine bool,args interface{},reply interface{}) error { func (slf *RpcHandler) callRpc(nodeId int,serviceMethod string,mutiCoroutine bool,args interface{},reply interface{}) error {
pClientList,err := slf.funcRpcClient(serviceMethod) pClientList,err := slf.funcRpcClient(nodeId,serviceMethod)
if err != nil { if err != nil {
log.Error("Call serviceMethod is error:%+v!",err) log.Error("Call serviceMethod is error:%+v!",err)
return err return err
@@ -290,14 +290,14 @@ func (slf *RpcHandler) callRpc(serviceMethod string,mutiCoroutine bool,args inte
return pResult.Err return pResult.Err
} }
func (slf *RpcHandler) asyncCallRpc(serviceMethod string,mutiCoroutine bool,args interface{},callback interface{}) error { func (slf *RpcHandler) asyncCallRpc(nodeid int,serviceMethod string,mutiCoroutine bool,args interface{},callback interface{}) error {
fVal := reflect.ValueOf(callback) fVal := reflect.ValueOf(callback)
if fVal.Kind()!=reflect.Func{ if fVal.Kind()!=reflect.Func{
return fmt.Errorf("input function is error!") return fmt.Errorf("input function is error!")
} }
reply := reflect.New(fVal.Type().In(0).Elem()).Interface() reply := reflect.New(fVal.Type().In(0).Elem()).Interface()
pClientList,err := slf.funcRpcClient(serviceMethod) pClientList,err := slf.funcRpcClient(nodeid,serviceMethod)
if err != nil { if err != nil {
log.Error("Call serviceMethod is error:%+v!",err) log.Error("Call serviceMethod is error:%+v!",err)
return err return err
@@ -353,25 +353,40 @@ func (slf *RpcHandler) GetName() string{
//func (slf *RpcHandler) goRpc(serviceMethod string,mutiCoroutine bool,args ...interface{}) error { //func (slf *RpcHandler) goRpc(serviceMethod string,mutiCoroutine bool,args ...interface{}) error {
//(reply *int,err error) {} //(reply *int,err error) {}
func (slf *RpcHandler) AsyncCall(serviceMethod string,args interface{},callback interface{}) error { func (slf *RpcHandler) AsyncCall(serviceMethod string,args interface{},callback interface{}) error {
return slf.asyncCallRpc(serviceMethod,false,args,callback) return slf.asyncCallRpc(0,serviceMethod,false,args,callback)
} }
func (slf *RpcHandler) GRAsyncCall(serviceMethod string,args interface{},callback interface{}) error { func (slf *RpcHandler) GRAsyncCall(serviceMethod string,args interface{},callback interface{}) error {
return slf.asyncCallRpc(serviceMethod,true,args,callback) return slf.asyncCallRpc(0,serviceMethod,true,args,callback)
} }
func (slf *RpcHandler) Call(serviceMethod string,args interface{},reply interface{}) error { func (slf *RpcHandler) Call(serviceMethod string,args interface{},reply interface{}) error {
return slf.callRpc(serviceMethod,false,args,reply) return slf.callRpc(0,serviceMethod,false,args,reply)
} }
func (slf *RpcHandler) GRCall(serviceMethod string,args interface{},reply interface{}) error { func (slf *RpcHandler) GRCall(serviceMethod string,args interface{},reply interface{}) error {
return slf.callRpc(serviceMethod,true,args,reply) return slf.callRpc(0,serviceMethod,true,args,reply)
} }
func (slf *RpcHandler) Go(serviceMethod string,args interface{}) error { func (slf *RpcHandler) Go(serviceMethod string,args interface{}) error {
return slf.goRpc(serviceMethod,false,args) return slf.goRpc(0,serviceMethod,false,args)
} }
func (slf *RpcHandler) GRGo(serviceMethod string,args interface{}) error { func (slf *RpcHandler) GRGo(serviceMethod string,args interface{}) error {
return slf.goRpc(serviceMethod,true,args) return slf.goRpc(0,serviceMethod,true,args)
} }
func (slf *RpcHandler) AsyncCallNode(nodeId int,serviceMethod string,args interface{},callback interface{}) error {
return slf.asyncCallRpc(nodeId,serviceMethod,false,args,callback)
}
func (slf *RpcHandler) CallNode(nodeId int,serviceMethod string,args interface{},reply interface{}) error {
return slf.callRpc(nodeId,serviceMethod,false,args,reply)
}
func (slf *RpcHandler) GoNode(nodeId int,serviceMethod string,args interface{}) error {
return slf.goRpc(nodeId,serviceMethod,false,args)
}