Merge pull request puppetlabs#8181 from joshcooper/lock_race_condition

(maint) Don't retry the lock if the deadline is now
joshcooper · May 27, 2020 · 9b5bd2a · 9b5bd2a
2 parents 94c7d4c + 14fe57a
commit 9b5bd2a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb
@@ -64,10 +64,10 @@ def run(client_options = {})
             now = Time.now.to_i
             wait_for_lock_deadline ||= now + Puppet[:maxwaitforlock]
 
-            if Puppet[:waitforlock]  < 1
+            if Puppet[:waitforlock] < 1
               Puppet.notice _("Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)") % { client_class: client_class, lockfile_path: lockfile_path }
               nil
-            elsif now > wait_for_lock_deadline
+            elsif now >= wait_for_lock_deadline
               Puppet.notice _("Exiting now because the maxwaitforlock timeout has been exceeded.")
               nil
             else