Changeset 244645 in webkit

Timestamp:

Apr 25, 2019 8:50:18 AM (5 years ago)

Author:

youenn@apple.com

Message:

[Mac iOS WK2] Layout Test http/wpt/cache-storage/cache-quota-after-restart.any.html is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=197040
<rdar://problem/49997641>

Reviewed by Antti Koivisto.

Delay write operations in case synchronize is ongoing.
This is restricted to AvoidRandomness mode which is always used by CacheAPI
and is also used by network cache for layout tests.

Tested by cache-quota-after-restart.any.html no longer exhibiting write disk errors.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::synchronize):
(WebKit::NetworkCache::Storage::store):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-25  Youenn Fablet  <youenn@apple.com>
+
+        [Mac iOS WK2] Layout Test http/wpt/cache-storage/cache-quota-after-restart.any.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=197040
+        <rdar://problem/49997641>
+
+        Reviewed by Antti Koivisto.
+
+        Delay write operations in case synchronize is ongoing.
+        This is restricted to AvoidRandomness mode which is always used by CacheAPI
+        and is also used by network cache for layout tests.
+
+        Tested by cache-quota-after-restart.any.html no longer exhibiting write disk errors.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::synchronize):
+        (WebKit::NetworkCache::Storage::store):
+
 2019-04-25  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -350 +350 @@
             m_approximateRecordsSize = recordsSize;
             m_synchronizationInProgress = false;
+            if (m_mode == Mode::AvoidRandomness)
+                dispatchPendingWriteOperations();
         });
 
@@ -898 +900 @@
 
     bool isInitialWrite = m_pendingWriteOperations.size() == 1;
-    if (!isInitialWrite)
+    if (!isInitialWrite || (m_synchronizationInProgress && m_mode == Mode::AvoidRandomness))
         return;