Title: [244645] trunk/Source/WebKit
- Revision
- 244645
- Author
- [email protected]
- Date
- 2019-04-25 08:50:18 -0700 (Thu, 25 Apr 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (244644 => 244645)
--- trunk/Source/WebKit/ChangeLog 2019-04-25 15:43:22 UTC (rev 244644)
+++ trunk/Source/WebKit/ChangeLog 2019-04-25 15:50:18 UTC (rev 244645)
@@ -1,3 +1,21 @@
+2019-04-25 Youenn Fablet <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r244627.
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp (244644 => 244645)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp 2019-04-25 15:43:22 UTC (rev 244644)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp 2019-04-25 15:50:18 UTC (rev 244645)
@@ -349,6 +349,8 @@
m_blobFilter = WTFMove(blobFilter);
m_approximateRecordsSize = recordsSize;
m_synchronizationInProgress = false;
+ if (m_mode == Mode::AvoidRandomness)
+ dispatchPendingWriteOperations();
});
});
@@ -897,7 +899,7 @@
addToRecordFilter(record.key);
bool isInitialWrite = m_pendingWriteOperations.size() == 1;
- if (!isInitialWrite)
+ if (!isInitialWrite || (m_synchronizationInProgress && m_mode == Mode::AvoidRandomness))
return;
m_writeOperationDispatchTimer.startOneShot(m_initialWriteDelay);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
