[incubator-servicecomb-service-center] branch master updated: SCB-128 Heartbeat failure when etcd has no leader. (#225)

[as...@apache.org]

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

asifdxtreme pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 37f9a3c  SCB-128 Heartbeat failure when etcd has no leader. (#225)
37f9a3c is described below

commit 37f9a3cfe4f51832eb4072a8cf45ec9e5e00e621
Author: little-cui <su...@qq.com>
AuthorDate: Tue Dec 26 18:05:21 2017 +0800

    SCB-128 Heartbeat failure when etcd has no leader. (#225)
---
 server/core/backend/store/lease.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/core/backend/store/lease.go b/server/core/backend/store/lease.go
index beeded1..04a2ff9 100644
--- a/server/core/backend/store/lease.go
+++ b/server/core/backend/store/lease.go
@@ -39,27 +39,29 @@ func (lat *LeaseAsyncTask) Key() string {
 	return lat.key
 }
 
-func (lat *LeaseAsyncTask) Do(ctx context.Context) error {
+func (lat *LeaseAsyncTask) Do(ctx context.Context) (err error) {
 	lat.StartTime = time.Now()
-	lat.TTL, lat.err = backend.Registry().LeaseRenew(ctx, lat.LeaseID)
+	lat.TTL, err = backend.Registry().LeaseRenew(ctx, lat.LeaseID)
 	lat.EndTime = time.Now()
-	if lat.err == nil {
+	if err == nil {
+		lat.err = err
 		util.LogNilOrWarnf(lat.CreateTime, "renew lease %d(rev: %s, run: %s), key %s",
 			lat.LeaseID,
 			lat.CreateTime.Format(TIME_FORMAT),
 			lat.StartTime.Format(TIME_FORMAT),
 			lat.Key())
-		return nil
+		return
 	}
 
-	util.Logger().Errorf(lat.err, "[%s]renew lease %d failed(rev: %s, run: %s), key %s",
+	util.Logger().Errorf(err, "[%s]renew lease %d failed(rev: %s, run: %s), key %s",
 		time.Now().Sub(lat.CreateTime),
 		lat.LeaseID,
 		lat.CreateTime.Format(TIME_FORMAT),
 		lat.StartTime.Format(TIME_FORMAT),
 		lat.Key())
-	if _, ok := lat.err.(errorsEx.InternalError); !ok {
-		return lat.err
+	if _, ok := err.(errorsEx.InternalError); !ok {
+		lat.err = err
+		return
 	}
 	return nil
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].