From 17c565c2aab87b455d661e6d9c438ccbf2e89612 Mon Sep 17 00:00:00 2001
From: Fernando Gasperi Jabalera <fgasperi@fb.com>
Date: Mon, 2 Mar 2020 09:03:33 -0800
Subject: [PATCH] [scheduler][restart] Fix timeout failures

Summary: Restore the global state also when `RestartScheduler.ProcnameAlreadyLocked` exceptions are catched.

Reviewed By: ngorogiannis

Differential Revision: D20189524

fbshipit-source-id: 8f8de5309
---
 infer/src/backend/ondemand.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infer/src/backend/ondemand.ml b/infer/src/backend/ondemand.ml
index 4bb44fbc9..1af6c1eef 100644
--- a/infer/src/backend/ondemand.ml
+++ b/infer/src/backend/ondemand.ml
@@ -220,7 +220,7 @@ let run_proc_analysis ~caller_pdesc callee_pdesc =
     IExn.reraise_if exn ~f:(fun () ->
         match exn with
         | RestartScheduler.ProcnameAlreadyLocked _ ->
-            clear_actives () ; true
+            clear_actives () ; restore_global_state old_state ; true
         | _ ->
             if not !logged_error then (
               let source_file = attributes.ProcAttributes.translation_unit in