New file from server is ok if local file is the same one

Bug #711389 reported by Facundo Batista on 2011-02-01
This bug affects 6 people
Affects Status Importance Assigned to Milestone
Ubuntu One Client
Facundo Batista
ubuntuone-client (Ubuntu)
Facundo Batista

Bug Description

The same file is put in two clients; one gets first to the server, and the other receives SV_FILE_NEW.

Right now, it's a conflict (all SV_FILE_NEW goes to conflict if the file already exists).

If the local file is in LOCAL and the hash is the same than the server, it should leave the file as is (maybe cancel the upload?).

If the local file is in NONE and local hash is still nothing (the file is still not hashed), it should just set the server hash in the node (will leave it in SERVER state, and the HQ_HASH_NEW will deal with this info when it arrives).

Related branches

description: updated
Facundo Batista (facundo) wrote :

Also, if the file is in NONE and both hashes are the same as the received from the server (note that SV_HASH_NEW is generated by Sync no matter the hashes), it just should don't do anything.

Moving this to critical because causes a mess if you just copy an UDF from machine to machine and subscribe it in the second machine (it does LR on the volume, and sends a RescanFromScratch to the server for that volume, and it finally generates a zillion SV_HASH_NEW, which causes a zillion conflicts).

Changed in ubuntuone-client:
importance: High → Critical
assignee: nobody → Lucio Torre (lucio.torre)
Facundo Batista (facundo) wrote :

In last comment I used SV_HASH_NEW incorrectly, I should have written SV_FILE_NEW

Changed in ubuntuone-client:
assignee: Lucio Torre (lucio.torre) → Facundo Batista (facundo)
status: Confirmed → In Progress
tags: added: u1-natty-beta
Changed in ubuntuone-client (Ubuntu):
status: New → Triaged
importance: Undecided → High
assignee: nobody → Facundo Batista (facundo)
milestone: none → ubuntu-11.04-beta-2
Changed in ubuntuone-client:
status: In Progress → Fix Committed
dobey (dobey) on 2011-04-11
Changed in ubuntuone-client:
status: Fix Committed → Fix Released
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package ubuntuone-client - 1.6.0-0ubuntu1

ubuntuone-client (1.6.0-0ubuntu1) natty; urgency=low

  * New upstream release.
    - Avoid conflict when same file already exists locally (LP: #711389)
    - Must move fils to trash on deletion (LP: #690673)
    - Support disconnection during initial connect attempt (LP: #711211)
    - Log version number on startup (LP: #715455)
    - Memory usage too high (LP: #721483)
    - Unsubscribed folders show as synced, if they exist (LP: #741835)
    - gnome-settings-daemon crash in g_str_hash (LP: #744383)
    - Should not re-queue uploads directly (LP: #744608)
    - No feedback when creating folder from symlink fails (LP: #747299)
    - [FFE] Use API to set urgency from background process (LP: #747677)
    - Open control panel to volumes when quota exceeded (LP: #702176)
    - Set the launcher to urgent when quota exceeded (LP: #702183)
    - nautilus crash in g_str_hash (LP: #724882)
    - Disable/enable file sync is buggy (LP: #744980)

  [Chris Coulson]
  * gnome-settings-daemon crash in g_return_fail_if_warning (LP: #744980)
 -- Rodney Dawes <email address hidden> Sun, 10 Apr 2011 21:24:30 -0400

Changed in ubuntuone-client (Ubuntu):
status: Triaged → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Duplicates of this bug

Other bug subscribers