Delete and recreate the sync database if it is corrupt.

chrome/browser/sync/syncable/directory_backing_store.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/sync/syncable/directory_backing_store.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include <limits>
 
+#include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable_columns.h"
 #include "chrome/browser/sync/util/crypto_helpers.h"
 #include "chrome/common/sqlite_utils.h"
 #include "third_party/sqlite/preprocessed/sqlite3.h"
@@ skipping 147 matching lines @@
   }
   if (NULL != save_dbhandle_) {
     sqlite3_close(save_dbhandle_);
     save_dbhandle_ = NULL;
   }
 }
 
 bool DirectoryBackingStore::OpenAndConfigureHandleHelper(
     sqlite3** handle) const {
   if (SQLITE_OK == OpenSqliteDb(backing_filepath_, handle)) {
+    sqlite_utils::scoped_sqlite_db_ptr scoped_handle(*handle);
     sqlite3_busy_timeout(*handle, std::numeric_limits<int>::max());
     {
       SQLStatement statement;
       statement.prepare(*handle, "PRAGMA fullfsync = 1");
       if (SQLITE_DONE != statement.step()) {
-        LOG(FATAL) << sqlite3_errmsg(*handle);
+        LOG(ERROR) << sqlite3_errmsg(*handle);
+        return false;
       }
     }
     {
       SQLStatement statement;
       statement.prepare(*handle, "PRAGMA synchronous = 2");
       if (SQLITE_DONE != statement.step()) {
-        LOG(FATAL) << sqlite3_errmsg(*handle);
+        LOG(ERROR) << sqlite3_errmsg(*handle);
+        return false;
       }
     }
     sqlite3_busy_timeout(*handle, kDirectoryBackingStoreBusyTimeoutMs);
 #if defined(OS_WIN)
     // Do not index this file. Scanning can occur every time we close the file,
     // which causes long delays in SQLite's file locking.
     const DWORD attrs = GetFileAttributes(backing_filepath_.value().c_str());
     const BOOL attrs_set =
       SetFileAttributes(backing_filepath_.value().c_str(),
                         attrs | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
 #endif
 
+    scoped_handle.release();

[tim (not reviewing), 2010/04/27 14:25:03]

this is necessary?

[albertb, 2010/04/27 15:05:41]

Yes. If the scoped ptr holds a valid db handle, it calls sqlite3_close when it
goes out of scope.

     return true;
   }
   return false;
 }
 
 DirOpenResult DirectoryBackingStore::Load(MetahandlesIndex* entry_bucket,
     ExtendedAttributes* xattrs_bucket,
     Directory::KernelLoadInfo* kernel_load_info) {
   if (!BeginLoad())
     return FAILED_OPEN_DATABASE;
 
   DirOpenResult result = InitializeTables();
   if (OPENED != result)
     return result;
 
   DropDeletedEntries();
   LoadEntries(entry_bucket);
   LoadExtendedAttributes(xattrs_bucket);
   LoadInfo(kernel_load_info);
 
   EndLoad();
   return OPENED;
 }
 
 bool DirectoryBackingStore::BeginLoad() {
   DCHECK(load_dbhandle_ == NULL);
+  bool ret = OpenAndConfigureHandleHelper(&load_dbhandle_);
+  if (ret)
+    return ret;
+  // Something's gone wrong. Nuke the database and try again.
+  LOG(ERROR) << "Sync database " << backing_filepath_.value()
+             << " corrupt. Deleting and recreating.";
+  file_util::Delete(backing_filepath_, false);
   return OpenAndConfigureHandleHelper(&load_dbhandle_);
 }
 
 void DirectoryBackingStore::EndLoad() {
   sqlite3_close(load_dbhandle_);
   load_dbhandle_ = NULL;  // No longer used.
 }
 
 bool DirectoryBackingStore::SaveChanges(
     const Directory::SaveChangesSnapshot& snapshot) {
@@ skipping 727 matching lines @@
       "name TEXT, "
       "store_birthday TEXT, "
       "db_create_version TEXT, "
       "db_create_time INT, "
       "next_id INT default -2, "
       "cache_guid TEXT)");
   return ExecQuery(load_dbhandle_, query.c_str());
 }
 
 }  // namespace syncable