uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-15 05:09:54 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add lazy connect when get dispatcher host from database

Browse Source
This commit is contained in:
TeoV
2020-05-28 12:06:12 +03:00
committed by Dan Christian Bogos
parent 814dafb1eb
commit f14a704691
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dispatchers/attributes_it_test.go
View File

@@ -31,6 +31,7 @@ import (
var sTestsDspAttr = []func(t *testing.T){
testDspAttrPingFailover,
testDspAttrPingFailover2,
testDspAttrGetAttrFailover,
testDspAttrGetAttrRoundRobin,
@@ -132,6 +133,49 @@ func testDspAttrPingFailover(t *testing.T) {
}
}
func testDspAttrPingFailover2(t *testing.T) {
var reply string
if err := allEngine.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
reply = ""
if err := allEngine2.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
reply = ""
ev := utils.CGREventWithArgDispatcher{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
},
ArgDispatcher: &utils.ArgDispatcher{
APIKey: utils.StringPointer("attr12345"),
},
}
allEngine.stopEngine(t) // stop the engine and the call should go to the second engine
if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
reply = ""
if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but recived %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
allEngine2.startEngine(t)
reply = ""
if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
}
func testDspAttrGetAttrFailover(t *testing.T) {
args := &engine.AttrArgsProcessEvent{
Context: utils.StringPointer("simpleauth"),

4
engine/datamanager.go
View File

@@ -2172,13 +2172,13 @@ func (dm *DataManager) GetDispatcherHost(tenant, id string, cacheRead, cacheWrit
}
if cacheWrite {
cfg := config.CgrConfig()
if dH.rpcConn, err = NewRPCPool(
if dH.rpcConn, err = NewRPCPool( // send it wil lazy connect on true and try to connect only when the call is make
rpcclient.PoolFirst,
cfg.TlsCfg().ClientKey,
cfg.TlsCfg().ClientCerificate, cfg.TlsCfg().CaCertificate,
cfg.GeneralCfg().ConnectAttempts, cfg.GeneralCfg().Reconnects,
cfg.GeneralCfg().ConnectTimeout, cfg.GeneralCfg().ReplyTimeout,
dH.Conns, IntRPC.GetInternalChanel(), false); err != nil {
dH.Conns, IntRPC.GetInternalChanel(), true); err != nil {
return nil, err
}
Cache.Set(utils.CacheDispatcherHosts, tntID, dH, nil,

9
utils/errors.go
View File

@@ -245,8 +245,10 @@ func IsNetworkError(err error) bool {
return false
}
if operr, ok := err.(*net.OpError); ok &&
strings.HasSuffix(operr.Err.Error(),
syscall.ECONNRESET.Error()) { // connection reset
(strings.HasSuffix(operr.Err.Error(),
syscall.ECONNRESET.Error()) ||
(strings.HasSuffix(operr.Err.Error(),
syscall.ECONNREFUSED.Error()))) { // connection reset
return true
}
return err.Error() == rpc.ErrShutdown.Error() ||
@@ -254,7 +256,8 @@ func IsNetworkError(err error) bool {
err.Error() == ErrDisconnected.Error() ||
err.Error() == ErrReplyTimeout.Error() ||
err.Error() == ErrSessionNotFound.Error() ||
strings.HasPrefix(err.Error(), "rpc: can't find service")
strings.HasPrefix(err.Error(), "rpc: can't find service") ||
strings.HasSuffix(err.Error(), "no such host")
}
func ErrPathNotReachable(path string) error {