You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/10/25 02:51:55 UTC

[dubbo-go] branch 3.0 updated: Fix: heartbeat's timeout will modify consumer's timeout (#1532)

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 6cd738c  Fix: heartbeat's timeout will modify consumer's timeout (#1532)
6cd738c is described below

commit 6cd738cfe4f6414f07bc2bd5764cd27be3571ad7
Author: Jason Peng <lv...@gmail.com>
AuthorDate: Mon Oct 25 10:51:49 2021 +0800

    Fix: heartbeat's timeout will modify consumer's timeout (#1532)
    
    * improve etcd version and change create to put (#1203)
    
    * fix: CONTRIBUTING.md url error. (#1303)
    
    * add lock (#1304)
    
    * Revert "add lock (#1304)" (#1329)
    
    This reverts commit a10996763e3e1ffa5cdbd80cb49319a4e3626994.
    
    * build(deps): bump github.com/dubbogo/gost from 1.11.14 to 1.11.16 (#1387)
    
    Bumps [github.com/dubbogo/gost](https://github.com/dubbogo/gost) from 1.11.14 to 1.11.16.
    - [Release notes](https://github.com/dubbogo/gost/releases)
    - [Commits](https://github.com/dubbogo/gost/compare/v1.11.14...v1.11.16)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/dubbogo/gost
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    
    * build(deps): bump google.golang.org/protobuf from 1.26.0 to 1.27.1 (#1386)
    
    Bumps [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) from 1.26.0 to 1.27.1.
    - [Release notes](https://github.com/protocolbuffers/protobuf-go/releases)
    - [Changelog](https://github.com/protocolbuffers/protobuf-go/blob/master/release.bash)
    - [Commits](https://github.com/protocolbuffers/protobuf-go/compare/v1.26.0...v1.27.1)
    
    ---
    updated-dependencies:
    - dependency-name: google.golang.org/protobuf
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    
    * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.0-alpha.0 to 3.5.0 (#1383)
    
    Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.0-alpha.0 to 3.5.0.
    - [Release notes](https://github.com/etcd-io/etcd/releases)
    - [Changelog](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md)
    - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.0-alpha.0...v3.5.0)
    
    ---
    updated-dependencies:
    - dependency-name: go.etcd.io/etcd/client/v3
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    
    * Fix: heartbeat's timeout will modify consumer's timeout
    
    Co-authored-by: AlexStocks <al...@foxmail.com>
    Co-authored-by: randy <zt...@gmail.com>
    Co-authored-by: LaurenceLiZhixin <38...@qq.com>
    Co-authored-by: Zhiqiang Li <st...@qq.com>
    Co-authored-by: tyltr <31...@users.noreply.github.com>
    Co-authored-by: Laurence <45...@users.noreply.github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    Co-authored-by: yuyu.zx <yu...@alipay.com>
    Co-authored-by: fangyincheng <fa...@sina.com>
---
 remoting/getty/listener.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remoting/getty/listener.go b/remoting/getty/listener.go
index 622d557..fc9d2f4 100644
--- a/remoting/getty/listener.go
+++ b/remoting/getty/listener.go
@@ -373,7 +373,7 @@ func heartbeat(session getty.Session, timeout time.Duration, callBack func(err e
 	req.Event = true
 	resp := remoting.NewPendingResponse(req.ID)
 	remoting.AddPendingResponse(resp)
-	totalLen, sendLen, err := session.WritePkg(req, 3*time.Second)
+	totalLen, sendLen, err := session.WritePkg(req, -1)
 	if sendLen != 0 && totalLen != sendLen {
 		logger.Warnf("start to close the session at heartbeat because %d of %d bytes data is sent success. err:%+v", sendLen, totalLen, err)
 		go session.Close()