621489 - Make sure to call _orderChildren even if _processIncoming fails

Status: VERIFIED FIXED

(Firefox :: Sync, defect)

Description

[ivanmelwise]

User-Agent:       Mozilla/5.0 (Windows NT 5.1; rv:2.0b9pre) Gecko/20101226 Firefox/4.0b9pre
Build Identifier: Mozilla/5.0 (Windows NT 5.1; rv:2.0b9pre) Gecko/20101226 Firefox/4.0b9pre

I've synced two linux PC successfully (almost) to Mozilla server. I had no problems with sync everything between that two machines connected to same LAN. Then I tried to sync my another machine. This one is WinXP. Sync's terminated. Mishmash in bookmarks.  

Reproducible: Always

Steps to Reproduce:
1. Make foldered structure of plenty of bookmarks on linux and sync them to Mozilla server.
2. Make slightly different foldered structure of plenty of bookmarks on WinXP and sync them to Mozilla server.
Actual Results:  
Holy mishmash in my bookmarks.

Expected Results:  
Bookmarks merged from all PCs.

Lin and XP machines had many same bookmarks in different places, so there was lots of changing GUIDs.

Comment 1

[ivanmelwise]

Attachment: Sync log

Comment 2

[Philipp von Weitershausen [:philikon]]

(In reply to comment #0)
> I've synced two linux PC successfully (almost) to Mozilla server. I had no
> problems with sync everything between that two machines connected to same LAN.
> Then I tried to sync my another machine. This one is WinXP. Sync's terminated.
> Mishmash in bookmarks.

By mishmash you mean wrong ordering, yes? I can see that happening because if _processIncoming fails for some reason (e.g. network timeout in your case), we don't call _orderChildren, leaving bookmarks in the wrong order. We should fix that, but in the mean time doing a Reset Sync should fix your problem.

> Lin and XP machines had many same bookmarks in different places, so there was
> lots of changing GUIDs.

Changing GUIDs is normal when merging two similar sets of bookmarks. In fact, when you have two identical profiles and you sync them, the dupe detection should change *all* GUIDs on the second profile.

Comment 3

[ivanmelwise]

(In reply to comment #2)
> By mishmash you mean wrong ordering, yes?
Yes. One should expect that after abrupt sync termination I believe.

>doing a Reset Sync should fix your problem.
Well, restoring my bookmarks is not a problem at all. Thanks.

Comment 4

[Philipp von Weitershausen [:philikon]]

Attachment: v1

Comment 5

[Philipp von Weitershausen [:philikon]]

default: https://hg.mozilla.org/services/fx-sync/rev/a0811178c067
1.6.x: https://hg.mozilla.org/services/fx-sync/rev/e77e7a9f8568

Comment 6

[LegNeato]

As per today's meeting, beta 9 will be a time-based release. Marking these all betaN+. Please move it back to beta9+ if you believe it MUST be in the next beta (ie: trunk is in an unshippable state without this)

Comment 7

[LegNeato]

Fixing fields my automated script accidentally blanked. Apologies for the bugspam

Comment 8

[Tracy Walker [:tracy]]

verified with current nightly build