Skip to content
This repository has been archived by the owner on Jul 31, 2020. It is now read-only.

Revert PR#313 (Merge by id and action) #317

Merged
merged 2 commits into from
May 30, 2019
Merged

Revert PR#313 (Merge by id and action) #317

merged 2 commits into from
May 30, 2019

Conversation

AlexeyBarabash
Copy link
Contributor

This is revert of #313 .

It causes problem with this STR

1. Create chain Android1 <=> Android2
2. Create bookmarks on Android1:
	wikipedia.com
	espn.com
	amazon.com
3. Wait untill bookmarks appear on Android2
4. Delete wikipedia.com from Android1
5. Wait untill bookmark will be deleted on Android2
6. Connect Core to chain
7.
Actual bookmarks:
	wikipedia.com
	espn.com
	amazon.com
Expected bookmarks:
	espn.com
	amazon.com

With these STR brave-core logs show

get-existing-objects:
	CREATE wikipedia.com
	CREATE espn.com
	CREATE amazon.com
	DELETE wikipedia.com
resolve: all pairs with null

[1207:1207:0530/132313.432076:INFO:CONSOLE(1)] "Ignoring DELETE of object 93,212,16,154,213,179,21,41,212,0,57,255,12,41,120,72.", source: chrome-extension://nomlkjnggnifocmealianaaiobmebgil/extension/brave-sync/bundles/bundle.js (1)

resolved-sync-records:
	CREATE wikipedia.com
	CREATE espn.com
	CREATE amazon.com

So it left first CREATE and second DELETE, but then ignored the second DELETE because existing_object==null

PR is not required when there is a fix of do not send records if there is no chain brave/brave-core@6f96849

@AlexeyBarabash AlexeyBarabash self-assigned this May 30, 2019
@darkdh
Copy link
Member

darkdh commented May 30, 2019

please separate new test case from revert commit

@AlexeyBarabash
Copy link
Contributor Author

Made a separate commits. CI succeeded.

@AlexeyBarabash AlexeyBarabash merged commit 066c4da into staging May 30, 2019
AlexeyBarabash added a commit that referenced this pull request May 30, 2019
@AlexeyBarabash
Merge pull request #317 from brave/revert_separate_create
75d463e 
Revert PR#313 (Merge by id and action)
@AlexeyBarabash AlexeyBarabash mentioned this pull request May 30, 2019
Merged
@darkdh darkdh deleted the revert_separate_create branch May 30, 2019 21:35
darkdh added a commit that referenced this pull request May 30, 2019
@darkdh
Merge pull request #318 from brave/revert_separate_create_master
7581f5f 
Merge pull request #317 from brave/revert_separate_create
AlexeyBarabash added a commit that referenced this pull request Jun 21, 2019
@AlexeyBarabash
Merge pull request #317 from brave/revert_separate_create
2966204 
Revert PR#313 (Merge by id and action)
@AlexeyBarabash AlexeyBarabash mentioned this pull request Oct 15, 2019
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@darkdh darkdh darkdh approved these changes

@diracdeltas diracdeltas Awaiting requested review from diracdeltas

@SergeyZhukovsky SergeyZhukovsky Awaiting requested review from SergeyZhukovsky

Assignees

@AlexeyBarabash AlexeyBarabash

Labels
bug
Projects
Sync - All platforms
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AlexeyBarabash @darkdh