avoid batching too much while send logs

absolute8511 · May 9, 2018 · 514e49b · 514e49b
1 parent e8d9425
commit 514e49b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/node/log_sender.go b/node/log_sender.go
@@ -19,6 +19,7 @@ var (
 	errInvalidRemoteCluster = errors.New("remote cluster is not valid")
 	errInvalidNamespace     = errors.New("namespace is not valid")
 	rpcTimeout              = time.Second * 5
+	sendLogTimeout          = time.Second * 30
 )
 
 type ccAPIClient struct {
@@ -182,7 +183,7 @@ func (s *RemoteLogSender) doSendOnce(r []*BatchInternalRaftRequest) error {
 	if nodeLog.Level() >= common.LOG_DETAIL {
 		nodeLog.Debugf("sending log : %v", addr, in.String())
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), rpcTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), sendLogTimeout)
 	defer cancel()
 	rpcErr, err := c.ApplyRaftReqs(ctx, in)
 	if err != nil {

diff --git a/node/syncer_learner.go b/node/syncer_learner.go
@@ -172,8 +172,12 @@ func (sm *logSyncerSM) handlerRaftLogs() {
 	for {
 		handled := false
 		var err error
+		sendCh := sm.sendCh
+		if len(raftLogs) > logSendBufferLen*2 {
+			sendCh = nil
+		}
 		select {
-		case req := <-sm.sendCh:
+		case req := <-sendCh:
 			last = req
 			raftLogs = append(raftLogs, req)
 			if nodeLog.Level() > common.LOG_DETAIL {