Skip to content

Commit

Permalink
Merge pull request #820 from wenxuwan/fix_panic_error
Browse files Browse the repository at this point in the history
Fix: go client quit abnormally when it connects java server
  • Loading branch information
zouyx committed Oct 31, 2020
1 parent 9a16d4f commit 7a33e64
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
1 change: 1 addition & 0 deletions remoting/getty/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ func (p *gettyRPCClientPool) get() (*gettyRPCClient, error) {
if d := now - conn.getActive(); d > p.ttl {
p.remove(conn)
go conn.close()
num = len(p.conns)
continue
}
conn.updateActive(now) //update active time
Expand Down
51 changes: 51 additions & 0 deletions remoting/getty/pool_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package getty

import (
"testing"
"time"
)

import (
"github.com/stretchr/testify/assert"
)

func TestGetConnFromPool(t *testing.T) {
var rpcClient Client

clientPoll := newGettyRPCClientConnPool(&rpcClient, 1, time.Duration(5*time.Second))

var conn1 gettyRPCClient
conn1.active = time.Now().Unix()
clientPoll.put(&conn1)
assert.Equal(t, 1, len(clientPoll.conns))

var conn2 gettyRPCClient
conn2.active = time.Now().Unix()
clientPoll.put(&conn2)
assert.Equal(t, 1, len(clientPoll.conns))
conn, err := clientPoll.get()
assert.Nil(t, err)
assert.Equal(t, &conn1, conn)
time.Sleep(6 * time.Second)
conn, err = clientPoll.get()
assert.Nil(t, conn)
assert.Nil(t, err)
assert.Equal(t, 0, len(clientPoll.conns))
}

0 comments on commit 7a33e64

Please sign in to comment.