From 88e2dc41c05926b5511021dfe1c5948f7decf221 Mon Sep 17 00:00:00 2001
From: Madhu Ravichandran <madhurav@uber.com>
Date: Wed, 24 Jan 2018 17:15:11 -0800
Subject: [PATCH 1/2] Remove debug log

---
 service/matching/taskListManager.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/service/matching/taskListManager.go b/service/matching/taskListManager.go
index 2ee28934386..d2a08de7ddd 100644
--- a/service/matching/taskListManager.go
+++ b/service/matching/taskListManager.go
@@ -642,10 +642,6 @@ deliverBufferTasksLoop:
 				c.logger.Info("Tasklist manager context is cancelled, shutting down")
 				break deliverBufferTasksLoop
 			}
-			c.logger.Debugf(
-				"Unable to send tasks for poll, rate limit failed, domain: %s, tasklist: %s, error: %s",
-				c.taskListID.domainID, c.taskListID.String(), err.Error(),
-			)
 			c.metricsClient.IncCounter(metrics.MatchingTaskListMgrScope, metrics.BufferThrottleCounter)
 			continue
 		}

From fcc8eed02ebcaaa2d19fa22058ac2ad31d96eea5 Mon Sep 17 00:00:00 2001
From: Madhu Ravichandran <madhurav@uber.com>
Date: Wed, 24 Jan 2018 17:34:57 -0800
Subject: [PATCH 2/2] Set high burst size to avoid busy looping

---
 service/matching/service.go              | 2 +-
 service/matching/taskListManager_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/matching/service.go b/service/matching/service.go
index fb6958ebe0d..1b4e11e52a7 100644
--- a/service/matching/service.go
+++ b/service/matching/service.go
@@ -55,7 +55,7 @@ func NewConfig() *Config {
 		UpdateAckInterval:               10 * time.Second,
 		OutstandingTaskAppendsThreshold: 250,
 		MaxTaskBatchSize:                100,
-		MinTaskThrottlingBurstSize:      5,
+		MinTaskThrottlingBurstSize:      10000,
 	}
 }
 
diff --git a/service/matching/taskListManager_test.go b/service/matching/taskListManager_test.go
index f27d345b8b6..c50536d101c 100644
--- a/service/matching/taskListManager_test.go
+++ b/service/matching/taskListManager_test.go
@@ -37,7 +37,7 @@ import (
 	"github.com/uber/cadence/common/persistence"
 )
 
-const _minBurst = 5
+const _minBurst = 10000
 
 func TestDeliverBufferTasks(t *testing.T) {
 	tests := []func(tlm *taskListManagerImpl){