Changeset 196386 in webkit

Timestamp:

Feb 10, 2016 1:05:37 PM (8 years ago)

Author:

rniwa@webkit.org

Message:

Add the support for maintenance mode
​https://bugs.webkit.org/show_bug.cgi?id=154072

Reviewed by Chris Dumez.

Added the crude support for maintenance mode whereby which the reports are stored in the filesystem
instead of the database.

• config.json: Added maintenanceMode and maintenanceDirectory as well as forgotten siteTitle and

remoteServer.httpdMutexDir.

• public/api/report.php:

(main): Don't connect to the database or modify database when maintenanceMode is set.

• public/include/json-header.php:

(ensure_privileged_api_data): Exit with InMaintenanceMode when maintenanceMode is set. This prevents
privileged API such as creating analysis tasks and new A/B testing groups from modifying the database.

Location:

trunk/Websites/perf.webkit.org

Files:

• ChangeLog (modified) (1 diff)
• config.json (modified) (3 diffs)
• public/api/report.php (modified) (2 diffs)
• public/include/json-header.php (modified) (1 diff)

trunk/Websites/perf.webkit.org/ChangeLog

@@ +1 @@
+2016-02-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Add the support for maintenance mode
+        https://bugs.webkit.org/show_bug.cgi?id=154072
+
+        Reviewed by Chris Dumez.
+
+        Added the crude support for maintenance mode whereby which the reports are stored in the filesystem
+        instead of the database.
+
+        * config.json: Added maintenanceMode and maintenanceDirectory as well as forgotten siteTitle and
+        remoteServer.httpdMutexDir.
+        * public/api/report.php:
+        (main): Don't connect to the database or modify database when maintenanceMode is set.
+        * public/include/json-header.php:
+        (ensure_privileged_api_data): Exit with InMaintenanceMode when maintenanceMode is set. This prevents
+        privileged API such as creating analysis tasks and new A/B testing groups from modifying the database.
+
 2016-02-09  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Websites/perf.webkit.org/config.json

@@ -1 +1 @@
 {
+    "siteTitle": "WebKit Performance Dashboard",
     "debug": true,
     "jsonCacheMaxAge": 600,
@@ -10 +11 @@
         "name": "webkit-perf-db"
     },
+    "maintenanceMode": false,
+    "maintenanceDirectory": "reported/",
     "testServer": {
         "hostname": "localhost",
@@ -21 +24 @@
         "httpdPID": "tools/remote-server-relay.pid",
         "httpdErrorLog": "tools/remote-server-relay.log",
-        "url": "http://perf.webkit.org",
+        "httpdMutexDir": "/tmp/org.webkit.perf.remote/",
+        "url": "https://perf-safari.apple.com",
         "basicAuth": {
             "username": "username",

trunk/Websites/perf.webkit.org/public/api/report.php

@@ -8 +8 @@
     set_exit_detail('failureStored', false);
 
+    $maintenance_mode = config('maintenanceMode');
+    if ($maintenance_mode && !config('maintenanceDirectory'))
+        exit_with_error('MaintenanceDirectoryNotSet');
+
     $db = new Database;
-    if (!$db->connect())
+    if (!$maintenance_mode && !$db->connect())
         exit_with_error('DatabaseConnectionFailure');
 
@@ -20 +24 @@
     set_exit_detail('processedRuns', 0);
     foreach ($parsed_json as $i => $report) {
-        $processor = new ReportProcessor($db);
-        $processor->process($report);
+        if (!$maintenance_mode) {
+            $processor = new ReportProcessor($db);
+            $processor->process($report);
+        }
         set_exit_detail('processedRuns', $i + 1);
     }
 
-    $generator = new ManifestGenerator($db);
-    if (!$generator->generate())
-        exit_with_error('FailedToGenerateManifest');
-    else if (!$generator->store())
-        exit_with_error('FailedToStoreManifest');
+    if ($maintenance_mode) {
+        $files = scandir(config_path('maintenanceDirectory', ''));
+        $i = 0;
+        $filename = '';
+        do {
+            $i++;
+            $filename = "$i.json";
+        } while (in_array($filename, $files));
+        file_put_contents(config_path('maintenanceDirectory', $filename), $post_data, LOCK_EX);
+    } else {
+        $generator = new ManifestGenerator($db);
+        if (!$generator->generate())
+            exit_with_error('FailedToGenerateManifest');
+        else if (!$generator->store())
+            exit_with_error('FailedToStoreManifest');
+    }
 
     exit_with_success();

trunk/Websites/perf.webkit.org/public/include/json-header.php

@@ -92 +92 @@
 function ensure_privileged_api_data() {
     global $HTTP_RAW_POST_DATA;
+
+    if (config('maintenanceMode'))
+        exit_with_error('InMaintenanceMode');
 
     if ($_SERVER['REQUEST_METHOD'] != 'POST')