Skip to content
Snippets Groups Projects
Commit a08392ce authored by AlexStocks's avatar AlexStocks
Browse files

fix remoting linter error

parent 971c854d
No related branches found
No related tags found
No related merge requests found
......@@ -99,7 +99,11 @@ func initZkData(group string, t *testing.T) (*zk.TestCluster, *zookeeperDynamicC
func TestGetConfig(t *testing.T) {
ts, reg := initZkData("dubbo", t)
defer ts.Stop()
defer func() {
if err := ts.Stop(); err != nil {
t.Errorf("ts.Stop() = error: %v", err)
}
}()
configs, err := reg.GetProperties(dubboPropertyFileName, config_center.WithGroup("dubbo"))
assert.NoError(t, err)
m, err := reg.Parser().Parse(configs)
......
......@@ -220,7 +220,11 @@ func (mr *MetadataReport) SaveServiceMetadata(identifier *identifier.ServiceMeta
if mr.syncReport {
return report.SaveServiceMetadata(identifier, url)
}
go report.SaveServiceMetadata(identifier, url)
go func() {
if err := report.SaveServiceMetadata(identifier, url); err != nil {
logger.Warnf("report.SaveServiceMetadata(identifier:%v, url:%v) = error:%v", identifier, url, err)
}
}()
return nil
}
......@@ -230,7 +234,11 @@ func (mr *MetadataReport) RemoveServiceMetadata(identifier *identifier.ServiceMe
if mr.syncReport {
return report.RemoveServiceMetadata(identifier)
}
go report.RemoveServiceMetadata(identifier)
go func() {
if err := report.RemoveServiceMetadata(identifier); err != nil {
logger.Warnf("report.RemoveServiceMetadata(identifier:%v) = error:%v", identifier, err)
}
}()
return nil
}
......@@ -255,7 +263,12 @@ func (mr *MetadataReport) SaveSubscribedData(identifier *identifier.SubscriberMe
if mr.syncReport {
return report.SaveSubscribedData(identifier, string(bytes))
}
go report.SaveSubscribedData(identifier, string(bytes))
go func() {
if err := report.SaveSubscribedData(identifier, string(bytes)); err != nil {
logger.Warnf("report.SaveSubscribedData(identifier:%v, string(bytes):%v) = error: %v",
identifier, string(bytes), err)
}
}()
return nil
}
......
......@@ -62,12 +62,19 @@ func TestNewMetadataService(t *testing.T) {
assert.Nil(t, err)
_, err = pxy.GetServiceDefinitionByServiceKey("any")
assert.Nil(t, err)
pxy.ExportURL(&common.URL{})
pxy.SubscribeURL(&common.URL{})
pxy.MethodMapper()
pxy.UnexportURL(&common.URL{})
pxy.RefreshMetadata(constant.ANY_VALUE, constant.ANY_VALUE)
ok, err := pxy.ExportURL(&common.URL{})
assert.False(t, ok)
assert.NoError(t, err)
ok, err = pxy.SubscribeURL(&common.URL{})
assert.False(t, ok)
assert.NoError(t, err)
m := pxy.MethodMapper()
assert.True(t, len(m) == 0)
err = pxy.UnexportURL(&common.URL{})
assert.NoError(t, err)
ok, err = pxy.RefreshMetadata(constant.ANY_VALUE, constant.ANY_VALUE)
assert.False(t, ok)
assert.NoError(t, err)
}
func createPxy() service.MetadataService {
......
......@@ -46,7 +46,9 @@ func TestMetadataService(t *testing.T) {
"owner=ZX&pid=1447&revision=0.0.1&side=provider&timeout=3000&timestamp=1556509797245&group=%v&version=%v&bean.name=%v",
protocol, serviceName, group, version, beanName))
assert.NoError(t, err)
mts.ExportURL(u2)
ok, err := mts.ExportURL(u2)
assert.True(t, ok)
assert.NoError(t, err)
u3, err := common.NewURL(fmt.Sprintf(
"%v://127.0.0.1:20000/com.ikurento.user.UserProvider3?anyhost=true&"+
......@@ -55,7 +57,9 @@ func TestMetadataService(t *testing.T) {
"owner=ZX&pid=1447&revision=0.0.1&side=provider&timeout=3000&timestamp=1556509797245&group=%v&version=%v&bean.name=%v",
protocol, serviceName, group, version, beanName))
assert.NoError(t, err)
mts.ExportURL(u3)
ok, err = mts.ExportURL(u3)
assert.True(t, ok)
assert.NoError(t, err)
u, err := common.NewURL(fmt.Sprintf(
"%v://127.0.0.1:20000/com.ikurento.user.UserProvider1?anyhost=true&"+
......@@ -64,20 +68,29 @@ func TestMetadataService(t *testing.T) {
"owner=ZX&pid=1447&revision=0.0.1&side=provider&timeout=3000&timestamp=1556509797245&group=%v&version=%v&bean.name=%v",
protocol, serviceName, group, version, beanName))
assert.NoError(t, err)
mts.ExportURL(u)
ok, err = mts.ExportURL(u)
assert.True(t, ok)
assert.NoError(t, err)
list, _ := mts.GetExportedURLs(serviceName, group, version, protocol)
assert.Equal(t, 3, len(list))
mts.SubscribeURL(u)
ok, err = mts.SubscribeURL(u)
assert.True(t, ok)
assert.NoError(t, err)
mts.SubscribeURL(u)
list2, _ := mts.GetSubscribedURLs()
ok, err = mts.SubscribeURL(u)
assert.False(t, ok)
assert.NoError(t, err)
list2, err := mts.GetSubscribedURLs()
assert.Equal(t, 1, len(list2))
assert.NoError(t, err)
mts.UnexportURL(u)
err = mts.UnexportURL(u)
assert.NoError(t, err)
list3, _ := mts.GetExportedURLs(serviceName, group, version, protocol)
assert.Equal(t, 2, len(list3))
mts.UnsubscribeURL(u)
err = mts.UnsubscribeURL(u)
assert.NoError(t, err)
list4, _ := mts.GetSubscribedURLs()
assert.Equal(t, 0, len(list4))
......@@ -90,6 +103,7 @@ func TestMetadataService(t *testing.T) {
def1, _ := mts.GetServiceDefinition(serviceName, group, version)
assert.Equal(t, expected, def1)
serviceKey := definition.ServiceDescriperBuild(serviceName, group, version)
def2, _ := mts.GetServiceDefinitionByServiceKey(serviceKey)
def2, err := mts.GetServiceDefinitionByServiceKey(serviceKey)
assert.Equal(t, expected, def2)
assert.NoError(t, err)
}
......@@ -220,29 +220,34 @@ func packRequest(service Service, header DubboHeader, req interface{}) ([]byte,
// body
//////////////////////////////////////////
if hb {
encoder.Encode(nil)
if err := encoder.Encode(nil); err != nil {
logger.Warnf("Encode(nil) = error: %v", err)
}
goto END
}
// dubbo version + path + version + method
if err := encoder.Encode(DEFAULT_DUBBO_PROTOCOL_VERSION); err != nil {
logger.Error("Encode(DEFAULT_DUBBO_PROTOCOL_VERSION) = error: %v", err)
logger.Warnf("Encode(DEFAULT_DUBBO_PROTOCOL_VERSION) = error: %v", err)
}
if err := encoder.Encode(service.Path); err != nil {
logger.Error("Encode(service.Path) = error: %v", err)
logger.Warnf("Encode(service.Path) = error: %v", err)
}
if err := encoder.Encode(service.Version); err != nil {
logger.Error("Encode(service.Version) = error: %v", err)
logger.Warnf("Encode(service.Version) = error: %v", err)
}
if err := encoder.Encode(service.Method); err != nil {
logger.Error("Encode(service.Method) = error: %v", err)
logger.Warnf("Encode(service.Method) = error: %v", err)
}
// args = args type list + args value list
if types, err = getArgsTypeList(args); err != nil {
return nil, perrors.Wrapf(err, " PackRequest(args:%+v)", args)
}
encoder.Encode(types)
if err := encoder.Encode(types); err != nil {
logger.Warnf("Encode(types:%v) = error: %v", types, err)
}
for _, v := range args {
encoder.Encode(v)
}
......
......@@ -82,7 +82,9 @@ func newFileSystemServiceDiscovery(name string) (registry.ServiceDiscovery, erro
}
extension.AddCustomShutdownCallback(func() {
sd.Destroy()
if err := sd.Destroy(); err != nil {
logger.Warnf("sd.Destroy() = error:%v", err)
}
})
for _, v := range sd.GetServices().Values() {
......
......@@ -44,7 +44,10 @@ func TestNewFileSystemServiceDiscoveryAndDestroy(t *testing.T) {
serviceDiscovery, err := newFileSystemServiceDiscovery(testName)
assert.NoError(t, err)
assert.NotNil(t, serviceDiscovery)
defer serviceDiscovery.Destroy()
defer func () {
err = serviceDiscovery.Destroy()
assert.Nil(t, err)
}()
}
func TestCURDFileSystemServiceDiscovery(t *testing.T) {
......@@ -78,8 +81,11 @@ func TestCURDFileSystemServiceDiscovery(t *testing.T) {
assert.NoError(t, err)
err = serviceDiscovery.Register(r1)
defer serviceDiscovery.Destroy()
assert.NoError(t, err)
defer func () {
err = serviceDiscovery.Destroy()
assert.NoError(t, err)
}()
}
func prepareData() {
......
......@@ -87,7 +87,9 @@ func getClient(url *common.URL) *Client {
exchangeClient := remoting.NewExchangeClient(url, client, 5*time.Second, false)
client.SetExchangeClient(exchangeClient)
client.Connect(url)
if err := client.Connect(url); err != nil {
return nil
}
return client
}
......@@ -396,7 +398,8 @@ func InitTest(t *testing.T) (*Server, *common.URL) {
"side=provider&timeout=3000&timestamp=1556509797245&bean.name=UserProvider")
// init server
userProvider := &UserProvider{}
common.ServiceMap.Register("", url.Protocol, "", "0.0.1", userProvider)
_, err = common.ServiceMap.Register("", url.Protocol, "", "0.0.1", userProvider)
assert.NoError(t, err)
invoker := &proxy_factory.ProxyInvoker{
BaseInvoker: *protocol.NewBaseInvoker(url),
}
......
......@@ -149,13 +149,23 @@ func (c *gettyRPCClient) newSession(session getty.Session) error {
panic(fmt.Sprintf("%s, session.conn{%#v} is not tcp connection\n", session.Stat(), session.Conn()))
}
tcpConn.SetNoDelay(conf.GettySessionParam.TcpNoDelay)
tcpConn.SetKeepAlive(conf.GettySessionParam.TcpKeepAlive)
if err := tcpConn.SetNoDelay(conf.GettySessionParam.TcpNoDelay); err != nil {
logger.Error("tcpConn.SetNoDelay() = error:%v", err)
}
if err := tcpConn.SetKeepAlive(conf.GettySessionParam.TcpKeepAlive); err != nil {
logger.Error("tcpConn.SetKeepAlive() = error:%v", err)
}
if conf.GettySessionParam.TcpKeepAlive {
tcpConn.SetKeepAlivePeriod(conf.GettySessionParam.keepAlivePeriod)
if err := tcpConn.SetKeepAlivePeriod(conf.GettySessionParam.keepAlivePeriod); err != nil {
logger.Error("tcpConn.SetKeepAlivePeriod() = error:%v", err)
}
}
if err := tcpConn.SetReadBuffer(conf.GettySessionParam.TcpRBufSize); err != nil {
logger.Error("tcpConn.SetReadBuffer() = error:%v", err)
}
if err := tcpConn.SetWriteBuffer(conf.GettySessionParam.TcpWBufSize); err != nil {
logger.Error("tcpConn.SetWriteBuffer() = error:%v", err)
}
tcpConn.SetReadBuffer(conf.GettySessionParam.TcpRBufSize)
tcpConn.SetWriteBuffer(conf.GettySessionParam.TcpWBufSize)
session.SetName(conf.GettySessionParam.SessionName)
session.SetMaxMsgLen(conf.GettySessionParam.MaxMsgLen)
......
......@@ -81,7 +81,10 @@ func verifyEventStateOrder(t *testing.T, c <-chan zk.Event, expectedStates []zk.
func Test_newMockZookeeperClient(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
err := ts.Stop()
assert.Nil(t, err)
}()
states := []zk.State{zk.StateConnecting, zk.StateConnected, zk.StateHasSession}
verifyEventStateOrder(t, event, states, "event channel")
......@@ -92,7 +95,10 @@ func Test_newMockZookeeperClient(t *testing.T) {
func TestCreate(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
err := ts.Stop()
assert.Nil(t, err)
}()
err = z.Create("test1/test2/test3/test4")
assert.NoError(t, err)
......@@ -103,7 +109,10 @@ func TestCreate(t *testing.T) {
func TestCreateDelete(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
err := ts.Stop()
assert.Nil(t, err)
}()
states := []zk.State{zk.StateConnecting, zk.StateConnected, zk.StateHasSession}
verifyEventStateOrder(t, event, states, "event channel")
......@@ -117,7 +126,10 @@ func TestCreateDelete(t *testing.T) {
func TestRegisterTemp(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
err := ts.Stop()
assert.Nil(t, err)
}()
err = z.Create("/test1/test2/test3")
assert.NoError(t, err)
......@@ -131,7 +143,10 @@ func TestRegisterTemp(t *testing.T) {
func TestRegisterTempSeq(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
err := ts.Stop()
assert.Nil(t, err)
}()
err = z.Create("/test1/test2/test3")
assert.NoError(t, err)
tmpath, err := z.RegisterTempSeq("/test1/test2/test3", []byte("test"))
......
......@@ -88,7 +88,11 @@ func (r *mockFacade) IsAvailable() bool {
func Test_Facade(t *testing.T) {
ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
defer ts.Stop()
defer func() {
if err := ts.Stop(); err != nil {
t.Errorf("tc.Stop() = error: %v", err)
}
}()
url, _ := common.NewURL("mock://127.0.0.1")
mock := newMockFacade(z, url)
go HandleClientRestart(mock)
......
......@@ -95,7 +95,11 @@ func TestListener(t *testing.T) {
`
var wait sync.WaitGroup
ts, client, event := initZkData(t)
defer ts.Stop()
defer func () {
if err := ts.Stop(); err != nil {
t.Errorf("ts.Stop() = error: %v", err)
}
}()
client.Wait.Add(1)
wait.Add(1)
go client.HandleZkEvent(event)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment