Skip to content

GitLab

T
tangled
Commit a2099403 authored by tzik@chromium.org's avatar tzik@chromium.org
Browse files
Options

Revert 241126 "[SyncFS] Add verbose logging to SyncEngineInitial..." 

> [SyncFS] Add verbose logging to SyncEngineInitializer
> 
> BUG=240165
> R=kinuko@chromium.org, nhiroki@chromium.org
> 
> Review URL: https://codereview.chromium.org/94003004

TBR=tzik@chromium.org

Review URL: https://codereview.chromium.org/117023002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241141 0039d316-1c4b-4281-b951-d872f2087c98
parent 200b2f2c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 55 deletions
chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
View file @ a2099403
......@@ -13,7 +13,6 @@
#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"
#include "chrome/browser/sync_file_system/logger.h"
#include "chrome/browser/sync_file_system/logger.h"
#include "chrome/browser/sync_file_system/syncable_file_system_util.h"
#include "google_apis/drive/drive_api_parser.h"
#include "google_apis/drive/gdata_wapi_parser.h"
......@@ -46,11 +45,8 @@ ListChangesTask::~ListChangesTask() {
}
void ListChangesTask::Run(const SyncStatusCallback& callback) {
util::Log(logging::LOG_VERBOSE, FROM_HERE, "[Changes] Start.");
if (!IsContextReady()) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Changes] Failed to get required sercive.");
util::Log(logging::LOG_ERROR, FROM_HERE, "Failed to get required sercive.");
RunSoon(FROM_HERE, base::Bind(callback, SYNC_STATUS_FAILED));
return;
}
......@@ -67,16 +63,13 @@ void ListChangesTask::DidListChanges(
scoped_ptr<google_apis::ResourceList> resource_list) {
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Changes] Failed to fetch change list.");
util::Log(logging::LOG_ERROR, FROM_HERE, "Failed to fetch change list.");
callback.Run(SYNC_STATUS_NETWORK_ERROR);
return;
}
if (!resource_list) {
NOTREACHED();
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Changes] Got invalid change list.");
callback.Run(SYNC_STATUS_FAILED);
return;
}
......@@ -102,14 +95,10 @@ void ListChangesTask::DidListChanges(
}
if (change_list_.empty()) {
util::Log(logging::LOG_VERBOSE, FROM_HERE, "[Changes] Got no change.");
callback.Run(SYNC_STATUS_NO_CHANGE_TO_SYNC);
return;
}
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Changes] Got %zd changes, updating MetadataDatabase.",
change_list_.size());
metadata_database()->UpdateByChangeList(
resource_list->largest_changestamp(),
change_list_.Pass(), callback);
......
chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
View file @ a2099403
......@@ -13,7 +13,6 @@
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"
#include "chrome/browser/sync_file_system/logger.h"
#include "google_apis/drive/drive_api_parser.h"
#include "google_apis/drive/gdata_wapi_parser.h"
......@@ -112,12 +111,8 @@ SyncEngineInitializer::~SyncEngineInitializer() {
}
void SyncEngineInitializer::Run(const SyncStatusCallback& callback) {
util::Log(logging::LOG_VERBOSE, FROM_HERE, "[Initialize] Start.");
// The metadata seems to have been already initialized. Just return with OK.
if (sync_context_ && sync_context_->GetMetadataDatabase()) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Already initialized.");
callback.Run(SYNC_STATUS_OK);
return;
}
......@@ -137,8 +132,6 @@ void SyncEngineInitializer::DidCreateMetadataDatabase(
SyncStatusCode status,
scoped_ptr<MetadataDatabase> instance) {
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to initialize MetadataDatabase.");
callback.Run(status);
return;
}
......@@ -146,8 +139,6 @@ void SyncEngineInitializer::DidCreateMetadataDatabase(
DCHECK(instance);
metadata_database_ = instance.Pass();
if (metadata_database_->HasSyncRoot()) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Found Local cache of sync-root.");
callback.Run(SYNC_STATUS_OK);
return;
}
......@@ -171,8 +162,6 @@ void SyncEngineInitializer::DidGetAboutResource(
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to get AboutResource.");
callback.Run(status);
return;
}
......@@ -187,8 +176,6 @@ void SyncEngineInitializer::DidGetAboutResource(
void SyncEngineInitializer::FindSyncRoot(const SyncStatusCallback& callback) {
if (find_sync_root_retry_count_++ >= kMaxRetry) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Reached max retry count.");
callback.Run(SYNC_STATUS_FAILED);
return;
}
......@@ -210,20 +197,10 @@ void SyncEngineInitializer::DidFindSyncRoot(
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to find sync root.");
callback.Run(status);
return;
}
if (!resource_list) {
NOTREACHED();
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Got invalid resource list.");
callback.Run(SYNC_STATUS_FAILED);
return;
}
ScopedVector<google_apis::ResourceEntry>* entries =
resource_list->mutable_entries();
for (ScopedVector<google_apis::ResourceEntry>::iterator itr =
......@@ -289,8 +266,6 @@ void SyncEngineInitializer::DidCreateSyncRoot(
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to create sync root.");
callback.Run(status);
return;
}
......@@ -315,8 +290,6 @@ void SyncEngineInitializer::DidDetachSyncRoot(
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to detach sync root.");
callback.Run(status);
return;
}
......@@ -343,20 +316,10 @@ void SyncEngineInitializer::DidListAppRootFolders(
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to get initial app-root folders.");
callback.Run(status);
return;
}
if (!resource_list) {
NOTREACHED();
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Got invalid initial app-root list.");
callback.Run(SYNC_STATUS_FAILED);
return;
}
ScopedVector<google_apis::ResourceEntry>* new_entries =
resource_list->mutable_entries();
app_root_folders_.insert(app_root_folders_.end(),
......@@ -392,15 +355,10 @@ void SyncEngineInitializer::DidPopulateDatabase(
const SyncStatusCallback& callback,
SyncStatusCode status) {
if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Failed to populate initial data"
" to MetadataDatabase.");
callback.Run(status);
return;
}
util::Log(logging::LOG_VERBOSE, FROM_HERE,
"[Initialize] Completed successfully.");
callback.Run(SYNC_STATUS_OK);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment