[SyncFS] Retry initialization of MetadataDatabase on failure of loading ServiceMetadata

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

 // Copyright 2013 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_file_system/drive_backend/metadata_database.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 1406 matching lines @@
 // static
 void MetadataDatabase::CreateOnWorkerTaskRunner(
     scoped_ptr<CreateParam> create_param,
     const CreateCallback& callback) {
   DCHECK(create_param->worker_task_runner->RunsTasksOnCurrentThread());
 
   scoped_ptr<MetadataDatabase> metadata_database(
       new MetadataDatabase(create_param->worker_task_runner,
                            create_param->database_path,
                            create_param->env_override));
+
   SyncStatusCode status = metadata_database->Initialize();
+  // Retry to initialize database, if the initialization fails.
+  for (int i = 0; i < kMaxRetry && status != SYNC_STATUS_OK; ++i) {

[tzik, 2014/09/03 04:47:37]

I think 2 is enough for the number of retry.

Can you add metadata_database.reset() here to avoid creating multiple instance
of leveldb::DB?

[peria, 2014/09/03 09:24:21]

Done.

+    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(
           callback, status, base::Passed(&metadata_database)));
 }
 
 SyncStatusCode MetadataDatabase::Initialize() {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
 
@@ skipping 11 matching lines @@
     if (status != SYNC_STATUS_OK)
       return status;
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           kEnableMetadataDatabaseOnDisk)) {
     index_ = MetadataDatabaseIndexOnDisk::Create(db_.get());
   } 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)
     return status;
 
   UpdateLargestKnownChangeID(index_->GetLargestChangeID());
 
   return status;
 }
 
@@ skipping 481 matching lines @@
       return false;
 
   if (!parents.empty())
     return false;
 
   return true;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system