Merge pull request #1349 from mozilla/revert-extended-sleep

Bug 1679949 - Hacky bug fix: Lower sleep time to one second
mozilla · Dec 2, 2020 · ccb4c1f · ccb4c1f
2 parents c9da1b7 + ab5efb6
commit ccb4c1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@
 [Full changelog](https://github.com/mozilla/glean/compare/v33.5.0...main)
 
 * Python
-  * BUGFIX: Network slowness or errors will no longer block the main dispatcher thread, leaving work undone on shutdown.
+  * BUGFIX: Network slowness or errors will no longer block the main dispatcher thread, leaving work undone on shutdown ([#1350](https://github.com/mozilla/glean/pull/1350)).
+  * BUGFIX: Lower sleep time on upload waits to avoid being stuck when the main process ends ([#1349](https://github.com/mozilla/glean/pull/1349)).
 
 # v33.5.0 (2020-12-01)
 
@@ -14,7 +15,7 @@
   * Introduce the Labeled metric type in the RLB [#1327](https://github.com/mozilla/glean/pull/1327).
   * Introduce the Quantity metric type in the RLB.
   * Introduce the `shutdown` API.
-  * Add Glean debugging APIs. 
+  * Add Glean debugging APIs.
 * Python
   * BUGFIX: Setting a UUID metric to a value that is not in the expected UUID format will now record an error with the Glean error reporting system.
 

diff --git a/glean-core/python/glean/net/ping_upload_worker.py b/glean-core/python/glean/net/ping_upload_worker.py
@@ -154,7 +154,7 @@ def _process(
                 incoming_task, upload_result.to_ffi()
             )
         elif tag == UploadTaskTag.WAIT:
-            time.sleep(throttle_backoff_time_s)
+            time.sleep(1)
         elif tag == UploadTaskTag.DONE:
             return True