FileAPI: Run database recovery on IOError.

webkit/fileapi/file_system_directory_database.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/file_system_directory_database.h"
 
 #include <math.h>
 #include <algorithm>
 #include <set>
 #include <stack>
@@ skipping 696 matching lines @@
   options.create_if_missing = true;
   leveldb::DB* db;
   leveldb::Status status = leveldb::DB::Open(options, path, &db);
   ReportInitStatus(status);
   if (status.ok()) {
     db_.reset(db);
     return true;
   }
   HandleError(FROM_HERE, status);
 
-  if (!status.IsCorruption())
+  if (!status.IsCorruption() && !status.IsIOError())

[kinuko, 2013/04/10 06:23:49]

Let me confirm. What other error types could we have here?

[tzik, 2013/04/10 06:49:20]

Status can be one of:
 - NotFound,
 - Corruption,
 - NotSupported,
 - InvalidArgument,
 - IOError.

NotFound is only when we look up the database,
Corruption and IOError are now handled here,
NotSupported and InvalidArgument looks irrelevant to handle here.

[kinuko, 2013/04/10 08:41:17]

Can we have a brief comment about them? Or at least should we have a comment why
we don't bail out for corruption and IO error case?

[tzik, 2013/04/10 10:59:49]

Done.

     return false;
 
   switch (recovery_option) {
     case FAIL_ON_CORRUPTION:
       return false;
     case REPAIR_ON_CORRUPTION:
       LOG(WARNING) << "Corrupted FileSystemDirectoryDatabase detected."
                    << " Attempting to repair.";
       if (RepairDatabase(path))
         return true;
@@ skipping 169 matching lines @@
 
 void FileSystemDirectoryDatabase::HandleError(
     const tracked_objects::Location& from_here,
     const leveldb::Status& status) {
   LOG(ERROR) << "FileSystemDirectoryDatabase failed at: "
              << from_here.ToString() << " with error: " << status.ToString();
   db_.reset();
 }
 
 }  // namespace fileapi