-
Notifications
You must be signed in to change notification settings - Fork 868
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Traces to diagnose crash (patches). Must not be merged to master
- Loading branch information
1 parent
3d1e9c1
commit 865ae19
Showing
4 changed files
with
133 additions
and
2 deletions.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc | ||
| index 492a0be24cb8c2d21d30bc426ecafa0083204da8..4bc5221dd37696672cb53a1b2cdac107bc7de79f 100644 | ||
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc | ||
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc | ||
| @@ -1154,7 +1154,7 @@ void BookmarkBarView::BookmarkModelLoaded(BookmarkModel* model, | ||
| // There should be no buttons. If non-zero it means Load was invoked more than | ||
| // once, or we didn't properly clear things. Either of which shouldn't happen. | ||
| // The actual bookmark buttons are added from Layout(). | ||
| - DCHECK(bookmark_buttons_.empty()); | ||
| +//BRAVETEST DCHECK(bookmark_buttons_.empty()); | ||
| DCHECK(model->other_node()); | ||
| other_bookmarks_button_->SetAccessibleName(model->other_node()->GetTitle()); | ||
| other_bookmarks_button_->SetText(model->other_node()->GetTitle()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| diff --git a/components/sync/engine_impl/commit.cc b/components/sync/engine_impl/commit.cc | ||
| index 76a01993d12cccfbdd97c9252ba757428682dbb3..2d323d1feba598bad86fa49d040fb4c3c29fab38 100644 | ||
| index 76a01993d12cccfbdd97c9252ba757428682dbb3..e41adc60268333300c52b4e603b56514ccdba138 100644 | ||
| --- a/components/sync/engine_impl/commit.cc | ||
| +++ b/components/sync/engine_impl/commit.cc | ||
| @@ -132,6 +132,7 @@ SyncerError Commit::PostAndProcessResponse( | ||
| @@ -132,6 +132,9 @@ SyncerError Commit::PostAndProcessResponse( | ||
| sync_pb::ClientToServerResponse response; | ||
| const SyncerError post_result = SyncerProtoUtil::PostClientToServerMessage( | ||
| message_, &response, cycle, nullptr); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " before BRAVE_COMMIT_POST_AND_PROCESS_RESPONSE"; | ||
| + BRAVE_COMMIT_POST_AND_PROCESS_RESPONSE | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " after BRAVE_COMMIT_POST_AND_PROCESS_RESPONSE"; | ||
| TRACE_EVENT_END0("sync", "PostCommit"); | ||
|
|
||
| // TODO(rlarocque): Use result that includes errors captured later? |
54 changes: 54 additions & 0 deletions
54
patches/components-sync_bookmarks-bookmark_model_type_processor.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| diff --git a/components/sync_bookmarks/bookmark_model_type_processor.cc b/components/sync_bookmarks/bookmark_model_type_processor.cc | ||
| index 4164377c989108c72c1cf7837a57110aecbbc101..4b9a1f07b23ec7df7d97ff0db9f0471fe7634e66 100644 | ||
| --- a/components/sync_bookmarks/bookmark_model_type_processor.cc | ||
| +++ b/components/sync_bookmarks/bookmark_model_type_processor.cc | ||
| @@ -200,6 +200,17 @@ void BookmarkModelTypeProcessor::OnCommitCompleted( | ||
| const syncer::FailedCommitResponseDataList& error_response_list) { | ||
| DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); | ||
|
|
||
| + VLOG(1) << "[BraveSync] " << __func__ << " 000 committed_response_list.size()=" << committed_response_list.size(); | ||
| + for (const syncer::CommitResponseData& response : committed_response_list) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.id =" << response.id; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.id_in_request =" << response.id_in_request; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.client_tag_hash =" << response.client_tag_hash; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.sequence_number =" << response.sequence_number; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.response_version =" << response.response_version; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.specifics_hash =" << response.specifics_hash; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " response.unsynced_time =" << response.unsynced_time; | ||
| + } | ||
| + | ||
| // |error_response_list| is ignored, because all errors are treated as | ||
| // transientand the processor with eventually retry. | ||
|
|
||
| @@ -278,6 +289,7 @@ void BookmarkModelTypeProcessor::ModelReadyToSync( | ||
| DCHECK(!bookmark_tracker_); | ||
| DCHECK(!bookmark_model_observer_); | ||
|
|
||
| + VLOG(1) << "[BraveSync] " << __func__ << " START"; | ||
| // TODO(crbug.com/950869): Remove after investigations are completed. | ||
| TRACE_EVENT0("browser", "BookmarkModelTypeProcessor::ModelReadyToSync"); | ||
|
|
||
| @@ -287,6 +299,23 @@ void BookmarkModelTypeProcessor::ModelReadyToSync( | ||
| base::TimeTicks start_time = base::TimeTicks::Now(); | ||
| sync_pb::BookmarkModelMetadata model_metadata; | ||
| model_metadata.ParseFromString(metadata_str); | ||
| + //model_metadata.model_type_state(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " model_metadata.bookmarks_metadata_size()=" << model_metadata.bookmarks_metadata_size(); | ||
| + for (const sync_pb::BookmarkMetadata& bookmark_metadata : model_metadata.bookmarks_metadata()) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << "------"; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.id()=" << bookmark_metadata.id(); | ||
| + //bookmark_metadata.metadata().client_tag_hash(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.metadata().server_id()=" << bookmark_metadata.metadata().server_id(); | ||
| + //bookmark_metadata.metadata().specifics_hash(); | ||
| + //bookmark_metadata.metadata().base_specifics_hash(); | ||
| + //bookmark_metadata.metadata().unique_position(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.metadata().sequence_number()=" << bookmark_metadata.metadata().sequence_number(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.metadata().acked_sequence_number()=" << bookmark_metadata.metadata().acked_sequence_number(); | ||
| + //bookmark_metadata.metadata().modification_time(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.metadata().is_deleted()=" << bookmark_metadata.metadata().is_deleted(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " bookmark_metadata.metadata().server_version()=" << bookmark_metadata.metadata().server_version(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << "------"; | ||
| + } | ||
|
|
||
| bookmark_tracker_ = SyncedBookmarkTracker::CreateFromBookmarkModelAndMetadata( | ||
| model, std::move(model_metadata)); |
62 changes: 62 additions & 0 deletions
62
patches/components-sync_bookmarks-synced_bookmark_tracker.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| diff --git a/components/sync_bookmarks/synced_bookmark_tracker.cc b/components/sync_bookmarks/synced_bookmark_tracker.cc | ||
| index 559ece6b2d651317b6871981ab9f024d0cb55455..d1931080f6cbcc81ed1dfc14d5bdb4235be32351 100644 | ||
| --- a/components/sync_bookmarks/synced_bookmark_tracker.cc | ||
| +++ b/components/sync_bookmarks/synced_bookmark_tracker.cc | ||
| @@ -505,6 +505,18 @@ SyncedBookmarkTracker::InitEntitiesFromModelAndMetadata( | ||
| sync_id_to_entities_map_[sync_id] = std::move(entity); | ||
| } | ||
|
|
||
| + VLOG(1) << "[BraveSync] " << __func__ << " sync_id_to_entities_map_:------------"; | ||
| + for (const auto &entry:sync_id_to_entities_map_) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " entry.first="<<entry.first; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " entry.second->IsUnsynced()="<<entry.second; | ||
| + if (entry.second){ | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " entry.second->IsUnsynced()="<<entry.second->IsUnsynced(); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " entry.second->bookmark_node()="<<entry.second->bookmark_node(); | ||
| + } | ||
| + VLOG(1) << "[BraveSync] " << __func__ << "---"; | ||
| + } | ||
| + VLOG(1) << "[BraveSync] " << __func__ << "------------"; | ||
| + | ||
| // See if there are untracked entities in the BookmarkModel. | ||
| std::vector<int> model_node_ids; | ||
| ui::TreeNodeIterator<const bookmarks::BookmarkNode> iterator( | ||
| @@ -515,6 +527,7 @@ SyncedBookmarkTracker::InitEntitiesFromModelAndMetadata( | ||
| continue; | ||
| } | ||
| if (bookmark_node_to_entities_map_.count(node) == 0) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " return CorruptionReason::UNTRACKED_BOOKMARK"; | ||
| return CorruptionReason::UNTRACKED_BOOKMARK; | ||
| } | ||
| } | ||
| @@ -525,6 +538,7 @@ SyncedBookmarkTracker::InitEntitiesFromModelAndMetadata( | ||
| client_tag_mismatch_found, bookmark_without_client_tag_found)); | ||
|
|
||
| CheckAllNodesTracked(model); | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " return CorruptionReason::NO_CORRUPTION"; | ||
| return CorruptionReason::NO_CORRUPTION; | ||
| } | ||
|
|
||
| @@ -599,6 +613,11 @@ void SyncedBookmarkTracker::UpdateUponCommitResponse( | ||
| const std::string& new_id, | ||
| int64_t acked_sequence_number, | ||
| int64_t server_version) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " old_id=" << old_id; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " new_id=" << new_id; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " acked_sequence_number=" << acked_sequence_number; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " server_version=" << server_version; | ||
| + | ||
| // TODO(crbug.com/516866): Update specifics if we decide to keep it. | ||
| Entity* entity = GetMutableEntityForSyncId(old_id); | ||
| if (!entity) { | ||
| @@ -620,7 +639,10 @@ void SyncedBookmarkTracker::UpdateUponCommitResponse( | ||
| void SyncedBookmarkTracker::UpdateSyncForLocalCreationIfNeeded( | ||
| const std::string& old_id, | ||
| const std::string& new_id) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " old_id=" << old_id; | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " new_id=" << new_id; | ||
| if (old_id == new_id) { | ||
| + VLOG(1) << "[BraveSync] " << __func__ << " early exit ids are equal"; | ||
| return; | ||
| } | ||
| // TODO(crbug.com/516866): The below CHECK is added to debug some crashes. |