Worker: Restart frequency protection also when no exception raised

raychorn · Jun 14, 2016 · 323b66f · 323b66f
1 parent 1f4813e
commit 323b66f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/celery/worker/consumer/consumer.py b/celery/worker/consumer/consumer.py
@@ -302,8 +302,14 @@ def _limit_task(self, request, bucket, tokens):
     def start(self):
         blueprint = self.blueprint
         while blueprint.state != CLOSE:
-            self.restart_count += 1
             maybe_shutdown()
+            if self.restart_count:
+                try:
+                    self._restart_state.step()
+                except RestartFreqExceeded as exc:
+                    crit('Frequent restarts detected: %r', exc, exc_info=1)
+                    sleep(1)
+            self.restart_count += 1
             try:
                 blueprint.start(self)
             except self.connection_errors as exc:
@@ -314,11 +320,6 @@ def start(self):
                 if isinstance(exc, OSError) and exc.errno == errno.EMFILE:
                     raise  # Too many open files
                 maybe_shutdown()
-                try:
-                    self._restart_state.step()
-                except RestartFreqExceeded as exc:
-                    crit('Frequent restarts detected: %r', exc, exc_info=1)
-                    sleep(1)
                 if blueprint.state != CLOSE:
                     if self.connection:
                         self.on_connection_error_after_connected(exc)