Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cachedConn lastClose update specified #191

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

cachedConn lastClose update specified #191

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
809bdcf
Merge pull request #1 from hyperledger/main
pfi79 Apr 6, 2021
2097477
Merge branch 'hyperledger:main' into main
pfi79 May 29, 2021
c68b922
Merge branch 'hyperledger:main' into main
pfi79 Jun 22, 2021
ca85b4d
Merge branch 'hyperledger:main' into main
pfi79 Sep 16, 2021
c2391e5
Merge branch 'hyperledger:main' into main
pfi79 Sep 24, 2021
f2ceccc
the lastClose parameter should be updated when closing only after a s…
pfi79 Sep 24, 2021
c750e0d
the lastClose parameter should be updated when closing only after a s…
pfi79 Sep 24, 2021
a0279e2
Merge branch 'main' into setClosed
pfi79 Sep 27, 2021
61ec8fa
Merge branch 'main' into setClosed
pfi79 Dec 2, 2021
c47a85f
Merge branch 'main' into setClosed
pfi79 Jan 17, 2022
7815b23
Merge branch 'main' into setClosed
pfi79 Jan 24, 2022
6586049
Merge branch 'main' into setClosed
pfi79 Mar 30, 2022
fae0d70
Merge branch 'main' into setClosed
pfi79 Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkg/fab/comm/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,12 @@ func (cc *CachingConnector) DialContext(ctx context.Context, target string, opts

cc.lock.Unlock()

if err := cc.openConn(ctx, c); err != nil {
if err = cc.openConn(ctx, c); err != nil {
cc.lock.Lock()
setClosed(c)
setClosed(c, err)
cc.removeConn(c)
cc.lock.Unlock()

return nil, errors.WithMessagef(err, "dialing connection on target [%s]", target)
}
return c.conn, nil
Expand Down Expand Up @@ -160,7 +161,7 @@ func (cc *CachingConnector) ReleaseConn(conn *grpc.ClientConn) {
}
logger.Debugf("ReleaseConn [%s]", cconn.target)

setClosed(cconn)
setClosed(cconn, nil)

cc.ensureJanitorStarted()
}
Expand Down Expand Up @@ -342,9 +343,12 @@ func closeConn(conn *grpc.ClientConn) {
cancel()
}

func setClosed(cconn *cachedConn) {
func setClosed(cconn *cachedConn, err error) {
if cconn.open > 0 {
cconn.lastClose = time.Now()
if err == nil {
cconn.lastClose = time.Now()
}

cconn.open--
}
}