Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(845)

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database.cc

Issue 527163002: [SyncFS] Retry initialization of MetadataDatabase on failure of loading ServiceMetadata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Work for nits Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 5456f52593ce52a28506f67bb25842de016b11d9..73aa434c755e0dbe515705fb2ba962fa043ad488 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1424,11 +1424,25 @@ void MetadataDatabase::CreateOnWorkerTaskRunner(
new MetadataDatabase(create_param->worker_task_runner,
create_param->database_path,
create_param->env_override));
+
SyncStatusCode status = metadata_database->Initialize();
+ if (status == SYNC_DATABASE_ERROR_FAILED) {
+ // Delete the previous instance to avoid creating a LevelDB instance for
+ // the same path.
+ metadata_database.reset();
+
+ metadata_database.reset(
+ new MetadataDatabase(create_param->worker_task_runner,
+ create_param->database_path,
+ create_param->env_override));
+ status = metadata_database->Initialize();
+ }
+
if (status != SYNC_STATUS_OK)
metadata_database.reset();
- metadata_database->DetachFromSequence();
+ if (metadata_database)
+ metadata_database->DetachFromSequence();
create_param->worker_task_runner->PostTask(
FROM_HERE,
base::Bind(
@@ -1460,6 +1474,16 @@ SyncStatusCode MetadataDatabase::Initialize() {
} else {
index_ = MetadataDatabaseIndex::Create(db_.get());
}
+ if (!index_) {
+ // Delete all entries in |db_| to reset it.
+ // TODO(peria): Make LevelDBWrapper::DestroyDB() to avoid a full scan.
+ scoped_ptr<LevelDBWrapper::Iterator> itr = db_->NewIterator();
+ for (itr->SeekToFirst(); itr->Valid();)
+ itr->Delete();
+ db_->Commit();
+
+ return SYNC_DATABASE_ERROR_FAILED;
+ }
status = LevelDBStatusToSyncStatusCode(db_->Commit());
if (status != SYNC_STATUS_OK)

Powered by Google App Engine
This is Rietveld 408576698