Changeset 271404 in webkit

Timestamp:

Jan 12, 2021 9:00:21 AM (3 years ago)

Author:

youenn@apple.com

Message:

Safari Networking high % CPU when Caches/WebKit/ServiceWorkers folder not writable
​https://bugs.webkit.org/show_bug.cgi?id=220220
<rdar://problem/72930195>

Reviewed by Chris Dumez.

In case writing changes in the service worker database fails, we retry once.
If it fails, we give up and will only retry writing when new changes happen.
Manually tested.

• workers/service/server/RegistrationDatabase.cpp:

(WebCore::RegistrationDatabase::pushChanges):
(WebCore::RegistrationDatabase::schedulePushChanges):

• workers/service/server/RegistrationDatabase.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/RegistrationDatabase.cpp (modified) (2 diffs)
• workers/service/server/RegistrationDatabase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-12  Youenn Fablet  <youenn@apple.com>
+
+        Safari Networking high % CPU when Caches/WebKit/ServiceWorkers folder not writable
+        https://bugs.webkit.org/show_bug.cgi?id=220220
+        <rdar://problem/72930195>
+
+        Reviewed by Chris Dumez.
+
+        In case writing changes in the service worker database fails, we retry once.
+        If it fails, we give up and will only retry writing when new changes happen.
+        Manually tested.
+
+        * workers/service/server/RegistrationDatabase.cpp:
+        (WebCore::RegistrationDatabase::pushChanges):
+        (WebCore::RegistrationDatabase::schedulePushChanges):
+        * workers/service/server/RegistrationDatabase.h:
+
 2021-01-12  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp

@@ -298 +298 @@
             removedRegistrations.append(keyValue.key.isolatedCopy());
     }
-    schedulePushChanges(WTFMove(updatedRegistrations), WTFMove(removedRegistrations), WTFMove(completionHandler));
-}
-
-void RegistrationDatabase::schedulePushChanges(Vector<ServiceWorkerContextData>&& updatedRegistrations, Vector<ServiceWorkerRegistrationKey>&& removedRegistrations, CompletionHandler<void()>&& completionHandler)
-{
-    postTaskToWorkQueue([this, protectedThis = makeRef(*this), pushCounter = m_pushCounter, updatedRegistrations = WTFMove(updatedRegistrations), removedRegistrations = WTFMove(removedRegistrations), completionHandler = WTFMove(completionHandler)]() mutable {
+    schedulePushChanges(WTFMove(updatedRegistrations), WTFMove(removedRegistrations), ShouldRetry::Yes, WTFMove(completionHandler));
+}
+
+void RegistrationDatabase::schedulePushChanges(Vector<ServiceWorkerContextData>&& updatedRegistrations, Vector<ServiceWorkerRegistrationKey>&& removedRegistrations, ShouldRetry shouldRetry, CompletionHandler<void()>&& completionHandler)
+{
+    auto pushCounter = shouldRetry == ShouldRetry::Yes ? m_pushCounter : 0;
+    postTaskToWorkQueue([this, protectedThis = makeRef(*this), pushCounter, updatedRegistrations = WTFMove(updatedRegistrations), removedRegistrations = WTFMove(removedRegistrations), completionHandler = WTFMove(completionHandler)]() mutable {
         bool success = doPushChanges(updatedRegistrations, removedRegistrations);
         if (success) {
@@ -311 +312 @@
         callOnMainThread([this, protectedThis = WTFMove(protectedThis), success, pushCounter, updatedRegistrations = WTFMove(updatedRegistrations).isolatedCopy(), removedRegistrations = WTFMove(removedRegistrations).isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
             if (!success && (pushCounter + 1) == m_pushCounter) {
-                // We retry writing if no other change was pushed.
-                schedulePushChanges(WTFMove(updatedRegistrations), WTFMove(removedRegistrations), WTFMove(completionHandler));
+                // We retry writing once if no other change was pushed.
+                schedulePushChanges(WTFMove(updatedRegistrations), WTFMove(removedRegistrations), ShouldRetry::No, WTFMove(completionHandler));
                 return;
             }

trunk/Source/WebCore/workers/service/server/RegistrationDatabase.h

@@ -62 +62 @@
     String databaseDirectoryIsolatedCopy() const { return m_databaseDirectory.isolatedCopy(); }
 
-    void schedulePushChanges(Vector<ServiceWorkerContextData>&&, Vector<ServiceWorkerRegistrationKey>&&, CompletionHandler<void()>&&);
+    enum class ShouldRetry { No, Yes };
+    void schedulePushChanges(Vector<ServiceWorkerContextData>&&, Vector<ServiceWorkerRegistrationKey>&&, ShouldRetry, CompletionHandler<void()>&&);
     void postTaskToWorkQueue(Function<void()>&&);