Fixing conflicts in encrypted folders


Recommended Posts

Hello,

I've been using Resilio for years between two Macs without major problems. Now, I have added an encrypted FreeNAS node and it has problems with conflicts. I would simply change the name of the conflicting files on the Macs but the thing is, I don't know which files are the ones causing conflicts: FreeNAS doesn't know the real name of this files (and rightly so), the Macs don't give any alert about the conflicts, and I'm unable to find a way to correlate the encrypted name that FreeNAS gives me with the real name of the files. What's the best way to solve this?

Link to post
Share on other sites

First, thank you for taking the time to help me.

About my setup: the 2 Macs are running macOS 10.13.5 (latest version). One of them is using Resilio 2.5.13 and the other one is using the Release Candidate of Resilio 2.6.0. The encrypted peer is running Resilio 2.5.9 (the latest version of the official FreeNAS plugin) and FreeNAS 11.1-U5 (latest version too). All of this computers are in the same physical location. The folder that's giving me problems has 112450 files for a total size of 88 GB.

If it's absolutely needed, I'll try to collect the logs and send them to you (after studying how much personal information they have), but keep in mind that I'm not trying to understand why there are conflicts: this folder has an awful lot of subfolders with very long filenames and symbolic links, so I'm not surprised that it has conflicts (I'm actually surprised that it only has 23 conflicts). What I want to know is which files are causing the conflicts, to simply rename them. And I would like to know how to do it myself, because I wouldn't like having to send you logs each time a conflict occurs.

So, if there is a way to correlate the encrypted file with is corresponding decrypted file using the debug log, could you tell me how to do it? I'm unable to find anything interesting in the debug logs... And if this kind of information is not in the debug log, is there any alternative way to find the offending files?

I tried to make a script that, knowing the file that's causing problems in the encrypted peer (the only information that I've found), searches the entire folder in one of the decrypted peers and returns the subfolders that:

  • Are at the same sublevel that the conflicting file in the encrypted peer.
  • Have the same number of files and subfolders that the one containing the conflicting file in the encrypted peer.
  • Have the same modification date as the folder with the conflicting file.

But it didn't worked properly, so I assume that Resilio changes the modification date of the synced files, and with the other 2 variables only I get too many matching subfolders. Is there a better way of doing this, or other things that I could add to the script to reduce the number of matches?

Link to post
Share on other sites
  • 2 weeks later...
  • 1 month later...

I've found a reliable way to find which files are the ones causing conflicts. Basically, you have to remove the conflict files in the encrypted folder and force a rescan, to make them appear in the logs of the devices with the decrypted folders:

  1. Make sure that all files are synced between your encrypted and decrypted devices, and stop all peers that could make changes in the folders with conflicts.
  2. In the device who has the encrypted folder with conflicts, go to the Resilio main view, click the orange exclamation mark and then click in the message saying that there are conflicts. A list with all the files with conflicts should appear.
  3. With that list open, use the web inspector to see the HTML of this view. Here is a guide to do this in Chrome. Doing this, you will see the path to each conflicting file in the encrypted folder.
  4. Remove the files with conflicts from the encrypted folder.
  5. Force a rescan of the encrypted folder. This can be done simply by restarting Resilio.
  6. When Resilio finish trying to download the conflicting files, go to a device with the decrypted folder and open its sync.log.
  7. Within this log, search each encrypted filename (you can get them from the list in step 1). Short after each one, there should be a message saying "load torrent request, will try to load torrent for file <file>" That's the decrypted file that's causing the conflicts! Rename it and the conflicts should go away.

With this, I've been able to solve all the conflicts in my setup.

Problems with this:

  1. There should be a way to see the path to the conflicted files without using the web inspector.
  2. This doesn't scale well: if you have hundreds of conflicts, this could be a real hassle (unless all conflicts are in the same subfolder).

I hope this helps anyone who has this problem in the future, and that Resilio implements a better way to do this.

Edited by bratten
Clarification
Link to post
Share on other sites

 

On 7/27/2018 at 8:35 PM, bratten said:

There should be a way to see the path to the conflicted files without using the web inspector.

there is. hove mouse over the conflicted file and see the path. click on it and sync will take you to the file 

1.png

On 7/27/2018 at 8:35 PM, bratten said:

message saying "load torrent request, will try to load torrent for file <file>" That's the decrypted file that's causing the conflicts!

not necessarily. While it may have worked for clearing conflicts in your case, i must warn that this line refers to all files that a peer wants to download. I mean seeing this line does not mean that there are some conflicts.

Link to post
Share on other sites
13 hours ago, Helen said:

 

there is. hove mouse over the conflicted file and see the path. click on it and sync will take you to the file 

1.png

I saw that black popup, but it didn't show the path, just the encrypted filename. I guess this doesn't work with large paths.

Quote

not necessarily. While it may have worked for clearing conflicts in your case, i must warn that this line refers to all files that a peer wants to download. I mean seeing this line does not mean that there are some conflicts

I made sure all files where synced before removing the conflict files and forcing the rescan. That way, no other files should be requested. I'll edit my previous post to clarify it.

Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.