From f3596c50747fd383998e03b3fbd2da3aa1c2510e Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 14 Apr 2016 08:08:38 -0700
Subject: [PATCH] Fix bugs in early triggering

---
 src/core/lib/iomgr/timer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/lib/iomgr/timer.c b/src/core/lib/iomgr/timer.c
index 5ebbbb270d6..acb5b26c870 100644
--- a/src/core/lib/iomgr/timer.c
+++ b/src/core/lib/iomgr/timer.c
@@ -184,11 +184,13 @@ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer,
   timer->triggered = 0;
 
   if (!g_initialized) {
+    timer->triggered = 1;
     grpc_exec_ctx_enqueue(exec_ctx, &timer->closure, false, NULL);
     return;
   }
 
   if (gpr_time_cmp(deadline, now) <= 0) {
+    timer->triggered = 1;
     grpc_exec_ctx_enqueue(exec_ctx, &timer->closure, true, NULL);
     return;
   }