tahoe-lafs
/
trac-2024-07-25
2
0
Issues 1.1k Wiki

Magic-folder erroneously creates ".conflict" files after joining a folder and restarting #2965

New Issue
Closed
opened 2019-01-29 14:26:34 +00:00 by crwood · 2 comments
crwood commented 2019-01-29 14:26:34 +00:00
Copy Link

Note: I'm splitting this specific issue off of #2911 since there are two separate bugs described there (which might be resolved/addressed separately):

I have a magic-folder full of Cat Pics on my dev VM which contains the following:

drwxr-xr-x  2 user user 4.0K Jan 15 14:30 .
drwxr-xr-x 77 user user  12K Jan 29 08:57 ..
-rw-------  1 user user 144K Sep 19 22:21 Cheshire Cat.jpeg
-rw-------  1 user user 264K Jan 10 20:24 Colonel Meow.jpg
-rw-------  1 user user 197K Jan 10 20:24 Garfield.jpg
-rw-------  1 user user 271K Jan 10 20:27 Grumpy Cat.jpg
-rw-------  1 user user 1.2M Jan 20 15:42 Kitler.png
-rw-------  1 user user 333K Jan 10 15:14 lolcat.jpg
-rw-------  1 user user 241K Jan 10 15:14 Nala.jpg
-rw-------  1 user user 368K Jan 20 17:13 Venus.jpg
-rw-------  1 user user 1.2M Jan 10 20:24 Waffles.jpg

When I create a magic-folder invite for this folder and join the folder on another testing VM, I see the following on the test VM (after restarting tahoe and allowing the first download/sync):

drwxr-xr-x  2 user user    4096 Jan 29 08:54 .
drwxr-xr-x 14 user user    4096 Jan 29 08:54 ..
-rw-------  1 user user  147098 Sep 19 22:21 Cheshire Cat.jpeg
-rw-------  1 user user  147098 Sep 19 22:21 Cheshire Cat.jpeg.conflict
-rw-------  1 user user  270297 Jan 10 20:24 Colonel Meow.jpg
-rw-------  1 user user  270297 Jan 10 20:24 Colonel Meow.jpg.conflict
-rw-------  1 user user  201576 Jan 10 20:24 Garfield.jpg
-rw-------  1 user user  201576 Jan 10 20:24 Garfield.jpg.conflict
-rw-------  1 user user  277284 Jan 10 20:27 Grumpy Cat.jpg
-rw-------  1 user user  277284 Jan 10 20:27 Grumpy Cat.jpg.conflict
-rw-------  1 user user 1249635 Jan 20 15:42 Kitler.png
-rw-------  1 user user 1249635 Jan 20 15:42 Kitler.png.conflict
-rw-------  1 user user  340635 Jan 10 15:14 lolcat.jpg
-rw-------  1 user user  340635 Jan 10 15:14 lolcat.jpg.conflict
-rw-------  1 user user  245995 Jan 10 15:14 Nala.jpg
-rw-------  1 user user  245995 Jan 10 15:14 Nala.jpg.conflict
-rw-------  1 user user  376601 Jan 20 17:13 Venus.jpg
-rw-------  1 user user  376601 Jan 20 17:13 Venus.jpg.conflict
-rw-------  1 user user 1178092 Jan 10 20:24 Waffles.jpg
-rw-------  1 user user 1178092 Jan 10 20:24 Waffles.jpg.conflict

The conflict files are identical:

user@test:~$ sha256sum Cat\ Pics/*
37586d9e7054e1187fa66debade178aab11c22dd06740807f5a1f86bb64c8b61  Cat Pics/Cheshire Cat.jpeg
37586d9e7054e1187fa66debade178aab11c22dd06740807f5a1f86bb64c8b61  Cat Pics/Cheshire Cat.jpeg.conflict
f01d7e67416905d99327ff3e770a97660aeee1e0819b4857b37c53eb8ffbc1f2  Cat Pics/Colonel Meow.jpg
f01d7e67416905d99327ff3e770a97660aeee1e0819b4857b37c53eb8ffbc1f2  Cat Pics/Colonel Meow.jpg.conflict
7db0c3cfb8feaae5e87f9fb4fc63de09e2d4fefa5d3b4b59a5633c6759c445c6  Cat Pics/Garfield.jpg
7db0c3cfb8feaae5e87f9fb4fc63de09e2d4fefa5d3b4b59a5633c6759c445c6  Cat Pics/Garfield.jpg.conflict
fe9200fb3c2916c13efb05ead60ca71c314c63b396fcb06d37170fe67e5d2a71  Cat Pics/Grumpy Cat.jpg
fe9200fb3c2916c13efb05ead60ca71c314c63b396fcb06d37170fe67e5d2a71  Cat Pics/Grumpy Cat.jpg.conflict
710c8ad0a2dd0a5dcc2cc72b4c804d924a276d54f4ca07d1a9f30f76e8ddbcb6  Cat Pics/Kitler.png
710c8ad0a2dd0a5dcc2cc72b4c804d924a276d54f4ca07d1a9f30f76e8ddbcb6  Cat Pics/Kitler.png.conflict
cb62f377b7c0c6d05daa7663bf508bbf2306042433f299a6e693f572dd22d206  Cat Pics/lolcat.jpg
cb62f377b7c0c6d05daa7663bf508bbf2306042433f299a6e693f572dd22d206  Cat Pics/lolcat.jpg.conflict
bc574478acf95571dd578c278a1567e6fdda546c732d723b38795831795c9d5a  Cat Pics/Nala.jpg
bc574478acf95571dd578c278a1567e6fdda546c732d723b38795831795c9d5a  Cat Pics/Nala.jpg.conflict
86a8eb5643ec3e37385b9993f9012a155425508617238f54c4217d66298e7f15  Cat Pics/Venus.jpg
86a8eb5643ec3e37385b9993f9012a155425508617238f54c4217d66298e7f15  Cat Pics/Venus.jpg.conflict
0f8eec20639c55c47fafc778e88649d801ce91982e5da8a63ee58b2fa81c2f37  Cat Pics/Waffles.jpg
0f8eec20639c55c47fafc778e88649d801ce91982e5da8a63ee58b2fa81c2f37  Cat Pics/Waffles.jpg.conflict

As a user, I would expect there to be no conflict files after I've joined a folder (unless, of course, I did something -- like modified said files before the download(s) completed).

Note: I'm splitting this specific issue off of #2911 since there are two separate bugs described there (which might be resolved/addressed separately): I have a magic-folder full of Cat Pics on my dev VM which contains the following: ``` drwxr-xr-x 2 user user 4.0K Jan 15 14:30 . drwxr-xr-x 77 user user 12K Jan 29 08:57 .. -rw------- 1 user user 144K Sep 19 22:21 Cheshire Cat.jpeg -rw------- 1 user user 264K Jan 10 20:24 Colonel Meow.jpg -rw------- 1 user user 197K Jan 10 20:24 Garfield.jpg -rw------- 1 user user 271K Jan 10 20:27 Grumpy Cat.jpg -rw------- 1 user user 1.2M Jan 20 15:42 Kitler.png -rw------- 1 user user 333K Jan 10 15:14 lolcat.jpg -rw------- 1 user user 241K Jan 10 15:14 Nala.jpg -rw------- 1 user user 368K Jan 20 17:13 Venus.jpg -rw------- 1 user user 1.2M Jan 10 20:24 Waffles.jpg ``` When I create a magic-folder invite for this folder and join the folder on another testing VM, I see the following on the test VM (after restarting tahoe and allowing the first download/sync): ``` drwxr-xr-x 2 user user 4096 Jan 29 08:54 . drwxr-xr-x 14 user user 4096 Jan 29 08:54 .. -rw------- 1 user user 147098 Sep 19 22:21 Cheshire Cat.jpeg -rw------- 1 user user 147098 Sep 19 22:21 Cheshire Cat.jpeg.conflict -rw------- 1 user user 270297 Jan 10 20:24 Colonel Meow.jpg -rw------- 1 user user 270297 Jan 10 20:24 Colonel Meow.jpg.conflict -rw------- 1 user user 201576 Jan 10 20:24 Garfield.jpg -rw------- 1 user user 201576 Jan 10 20:24 Garfield.jpg.conflict -rw------- 1 user user 277284 Jan 10 20:27 Grumpy Cat.jpg -rw------- 1 user user 277284 Jan 10 20:27 Grumpy Cat.jpg.conflict -rw------- 1 user user 1249635 Jan 20 15:42 Kitler.png -rw------- 1 user user 1249635 Jan 20 15:42 Kitler.png.conflict -rw------- 1 user user 340635 Jan 10 15:14 lolcat.jpg -rw------- 1 user user 340635 Jan 10 15:14 lolcat.jpg.conflict -rw------- 1 user user 245995 Jan 10 15:14 Nala.jpg -rw------- 1 user user 245995 Jan 10 15:14 Nala.jpg.conflict -rw------- 1 user user 376601 Jan 20 17:13 Venus.jpg -rw------- 1 user user 376601 Jan 20 17:13 Venus.jpg.conflict -rw------- 1 user user 1178092 Jan 10 20:24 Waffles.jpg -rw------- 1 user user 1178092 Jan 10 20:24 Waffles.jpg.conflict ``` The conflict files are identical: ``` user@test:~$ sha256sum Cat\ Pics/* 37586d9e7054e1187fa66debade178aab11c22dd06740807f5a1f86bb64c8b61 Cat Pics/Cheshire Cat.jpeg 37586d9e7054e1187fa66debade178aab11c22dd06740807f5a1f86bb64c8b61 Cat Pics/Cheshire Cat.jpeg.conflict f01d7e67416905d99327ff3e770a97660aeee1e0819b4857b37c53eb8ffbc1f2 Cat Pics/Colonel Meow.jpg f01d7e67416905d99327ff3e770a97660aeee1e0819b4857b37c53eb8ffbc1f2 Cat Pics/Colonel Meow.jpg.conflict 7db0c3cfb8feaae5e87f9fb4fc63de09e2d4fefa5d3b4b59a5633c6759c445c6 Cat Pics/Garfield.jpg 7db0c3cfb8feaae5e87f9fb4fc63de09e2d4fefa5d3b4b59a5633c6759c445c6 Cat Pics/Garfield.jpg.conflict fe9200fb3c2916c13efb05ead60ca71c314c63b396fcb06d37170fe67e5d2a71 Cat Pics/Grumpy Cat.jpg fe9200fb3c2916c13efb05ead60ca71c314c63b396fcb06d37170fe67e5d2a71 Cat Pics/Grumpy Cat.jpg.conflict 710c8ad0a2dd0a5dcc2cc72b4c804d924a276d54f4ca07d1a9f30f76e8ddbcb6 Cat Pics/Kitler.png 710c8ad0a2dd0a5dcc2cc72b4c804d924a276d54f4ca07d1a9f30f76e8ddbcb6 Cat Pics/Kitler.png.conflict cb62f377b7c0c6d05daa7663bf508bbf2306042433f299a6e693f572dd22d206 Cat Pics/lolcat.jpg cb62f377b7c0c6d05daa7663bf508bbf2306042433f299a6e693f572dd22d206 Cat Pics/lolcat.jpg.conflict bc574478acf95571dd578c278a1567e6fdda546c732d723b38795831795c9d5a Cat Pics/Nala.jpg bc574478acf95571dd578c278a1567e6fdda546c732d723b38795831795c9d5a Cat Pics/Nala.jpg.conflict 86a8eb5643ec3e37385b9993f9012a155425508617238f54c4217d66298e7f15 Cat Pics/Venus.jpg 86a8eb5643ec3e37385b9993f9012a155425508617238f54c4217d66298e7f15 Cat Pics/Venus.jpg.conflict 0f8eec20639c55c47fafc778e88649d801ce91982e5da8a63ee58b2fa81c2f37 Cat Pics/Waffles.jpg 0f8eec20639c55c47fafc778e88649d801ce91982e5da8a63ee58b2fa81c2f37 Cat Pics/Waffles.jpg.conflict ``` As a user, I would expect there to be no conflict files after I've joined a folder (unless, of course, I did something -- like modified said files before the download(s) completed).
crwood added the
code-frontend-magic-folder
normal
defect
1.12.1
 labels 2019-01-29 14:26:34 +00:00
crwood added this to the undecided milestone 2019-01-29 14:26:34 +00:00
exarkun commented 2019-03-18 20:37:37 +00:00
Copy Link

(https://github.com/tahoe-lafs/tahoe-lafs/pull/575)

(https://github.com/tahoe-lafs/tahoe-lafs/pull/575)
GitHub <noreply@github.com> commented 2019-03-19 16:05:47 +00:00
Owner
Copy Link

In 528e451/trunk:

Merge pull request #575 from tahoe-lafs/2965.erroneous-conflicts-at-startup

Avoid some start-up time erroneous Magic-Folder conflict files

Fixes: ticket:2965
In [528e451/trunk](/tahoe-lafs/trac-2024-07-25/commit/528e451f39611cdf2b64c47d227b24102e34fc63): ``` Merge pull request #575 from tahoe-lafs/2965.erroneous-conflicts-at-startup Avoid some start-up time erroneous Magic-Folder conflict files Fixes: ticket:2965 ```
tahoe-lafs added the
fixed
 label 2019-03-19 16:05:47 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels   
0.2.0

   
0.3.0

   
0.4.0

   
0.5.0

   
0.5.1

   
0.6.0

   
0.6.1

   
0.7.0

   
0.8.0

   
0.9.0

   
1.0.0

   
1.1.0

   
1.10.0

   
1.10.1

   
1.10.2

   
1.10a2

   
1.11.0

   
1.12.0

   
1.12.1

   
1.13.0

   
1.14.0

   
1.15.0

   
1.15.1

   
1.2.0

   
1.3.0

   
1.4.1

   
1.5.0

   
1.6.0

   
1.6.1

   
1.7.0

   
1.7.1

   
1.7β

   
1.8.0

   
1.8.1

   
1.8.2

   
1.8.3

   
1.8β

   
1.9.0

   
1.9.0-s3branch

   
1.9.0a1

   
1.9.0a2

   
1.9.0b1

   
1.9.1

   
1.9.2

   
1.9.2a1

   
LeastAuthority.com automation

   
blocker

   
cannot reproduce

   
cloud-branch

   
code

catch-all for anything that can be fixed by writing code but isn't classified better

  
code-dirnodes

anything involving tahoe directories

  
code-encoding

immutable-file encoding format/layout, cap format, encoding/decoding algorithms

  
code-frontend

general frontend things: new user-facing interfaces, FTP/SFTP servers, FUSE-like interfaces

  
code-frontend-cli

CLI tools

  
code-frontend-ftp-sftp

   
code-frontend-magic-folder

   
code-frontend-web

webapi interfaces, user-facing "WUI" interfaces

  
code-mutable

anything involving mutable files: encoding/decoding, share format

  
code-network

Introducer, locating storage servers, establishing/maintaining connections to them

  
code-nodeadmin

node startup/shutdown, tools to create nodes, logging tools, management/monitoring tools, manhole, disk-space-limiting tools

  
code-peerselection

server selection/sorting algorithm, rebalancing code, allocation policy, swarming-download

  
code-storage

storage-server implementation, share-storage directory layout, client-to-server share transfer protocol

  
contrib

problems with non-core things that live in the source:contrib/ directory

  
critical

   
defect

   
dev-infrastructure

things that help us build Tahoe: buildbot, automated speed/memory/code-coverage tests and results-displayers, IRC channels, mailing lists, this Trac instance

  
documentation

docs items. Also use 'docs' keyword on tickets in more specific components.

  
duplicate

   
enhancement

   
fixed

   
invalid

   
major

   
minor

   
n/a

   
normal

   
operational

things involved in running a tahoe grid, external tools to monitor/maintain a grid (like "nodeadmin" but larger-scale). Was also used for issues with the allmydata.com grid.

  
packaging

setup.py script, library dependencies, binary packages, licensing, installation instructions

  
somebody else's problem

   
supercritical

   
task

   
trivial

   
unknown

Uncategorized. All tickets default to this component until someone updates it.

  
was already fixed

   
website

things about the tahoe-lafs.org website (and sometimes this Trac instance, shared with 'dev-infrastructure')

  
wontfix

   
worksforme
No Label
0.2.0
0.3.0
0.4.0
0.5.0
0.5.1
0.6.0
0.6.1
0.7.0
0.8.0
0.9.0
1.0.0
1.1.0
1.10.0
1.10.1
1.10.2
1.10a2
1.11.0
1.12.0
1.12.1
1.13.0
1.14.0
1.15.0
1.15.1
1.2.0
1.3.0
1.4.1
1.5.0
1.6.0
1.6.1
1.7.0
1.7.1
1.7β
1.8.0
1.8.1
1.8.2
1.8.3
1.8β
1.9.0
1.9.0-s3branch
1.9.0a1
1.9.0a2
1.9.0b1
1.9.1
1.9.2
1.9.2a1
LeastAuthority.com automation
blocker
cannot reproduce
cloud-branch
code
code-dirnodes
code-encoding
code-frontend
code-frontend-cli
code-frontend-ftp-sftp
code-frontend-magic-folder
code-frontend-web
code-mutable
code-network
code-nodeadmin
code-peerselection
code-storage
contrib
critical
defect
dev-infrastructure
documentation
duplicate
enhancement
fixed
invalid
major
minor
n/a
normal
operational
packaging
somebody else's problem
supercritical
task
trivial
unknown
was already fixed
website
wontfix
worksforme
Milestone
Clear milestone
No items
No Milestone
undecided
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Reference: tahoe-lafs/trac-2024-07-25#2965
No description provided.
Delete Branch "%!s(<nil>)"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?