server-side tree deletion results in .u1conflict folders on clients.

I dont' know precisely what part of the system is dropping the ball here, so I'm putting this bug report in client as well.

I just reproduced this with syncdaemon in debug mode.

When a SV_FILE_DELETE arrives, and the directory is *not* empty, we move it to conflict.

We will do the following: in this case, we'll check all the nodes of the tree that starts from that dir, and see if there's any file in LOCAL (a change that still not in the server). If we found any, we signal a conflict like now, if not, we remove everything.

During the time that takes us to review all the nodes (that is very small, but not zero), the user can execute any action in the filesystem... if that's a FS_FILE/DIR_CREATE, FS_FILE_CLOSE_WRITE, or FS_FILE/DIR_MOVE, we consider the trees as "dirty" and go to conflict.

Log file: http://paste.ubuntu.com/369136/

1. Start ubuntuone-client-applet, connect to ubuntuone, make sure syncdaemon is connected
2. Put a directory to Ubuntu One
3. Disconnect syncdaemon
4. Add local file to created directory, make sure that it got local hash
5. Go to web interface
6. Delete directory tree from web interface
7. Connect syncdaemon to ubuntuone
8. Observe that both local file and directory is removed, NOT moved to conflicts.

Confirmed on ubuntuone-client: Installed: 1.0.3-0ubuntu1

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

---------------
ubuntuone-client (1.0.3-0ubuntu1) karmic-proposed; urgency=high

  * New upstream release
    - Remove patch files now in upstream for #462828
    - Require python-ubuntuone-storageprotocol >= 1.0.1
    - BadTransition: SYS_CONNECTION_MADE (LP: #457147)
    - ValueError: invalid literal for int() with base 10: 'None' (LP: #476777)
    - Protocol version error with bw throttling enabled (LP: #455544)
    - Folder deletion from other machines results in conflicts (LP: #462003)
    - Syncdaemon doesn't disable throttling (LP: #483592)
    - Syncdaemon crashes with NoAccessToken (LP: #488413)
    - Error creating share from Nautilus: callback() (LP: #492100)
    - Work without NetworkManager installed (LP: #357395)
    - Create a POT during the build (LP: #455527)
    - Bring back timestamps in oauth-login.log (LP: #459175)
    - Applet starts syncdaemon without a token (LP: #491573)
    - Prefs changes don't take immediate affect (LP: #457564)
    - BW limit settings don't appear to be saved (LP: #465030)
    - Distinguish auth errors from other errors (LP: #450633)
    - Fix for running on python < 2.6.3 (LP: #451670)
 -- Rodney Dawes <email address hidden> Fri, 11 Dec 2009 15:45:52 -0500

Confirming file removal on trunk. Syncdaemon logs are attached,

Facundo suggested this possible fix: https://pastebin.canonical.com/27792/
We need to build proper test cases.

On Tue, 2010-02-16 at 16:16 +0000, Naty Bidart wrote:
> Facundo suggested this possible fix: https://pastebin.canonical.com/27792/
> We need to build proper test cases.
...
+ for (dirpath, dirnames, filenames) in os.walk(path):
+ for fname in filenames:
+ if fname.endswith(self.CONFLICT_SUFFIX):
+ logger("Conflicting dir remove because previous "
+ "conflict: %r", os.path.join(dirpath, fname))
+ return False
...

I'd suggest that it should also check dirnames for conflict suffix,
since it is possible to have the whole directory to be marked as a
conflict. Just to be on a safe side.