Changeset 2977 for box/trunk/bin

Timestamp:

29/07/2011 19:52:25 (10 months ago)

Author:

chris

Message:

Warn users if a file with multiple hard links is encountered during backup.

Location:

box/trunk/bin/bbackupd

Files:

• BackupClientDirectoryRecord.cpp (modified) (2 diffs)
• BackupClientDirectoryRecord.h (modified) (1 diff)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -54 +54 @@
           mInitialSyncDone(false),
           mSyncDone(false),
+          mSuppressMultipleLinksWarning(false),
           mpPendingEntries(0)
 {
@@ -322 +323 @@
                                 }
 
+                                int type = file_st.st_mode & S_IFMT;
+
+                                // ecryptfs reports nlink > 1 for directories
+                                // with contents, but no filesystem supports
+                                // hardlinking directories? so we can ignore
+                                // this if the entry is a directory.
+                                if(file_st.st_nlink != 1 && type == S_IFDIR)
+                                {
+                                        BOX_INFO("Ignoring apparent hard link "
+                                                "count on directory: " <<
+                                                filename << ", nlink=" <<
+                                                file_st.st_nlink);
+                                }
+                                else if(file_st.st_nlink != 1)
+                                {
+                                        if(!mSuppressMultipleLinksWarning)
+                                        {
+                                                BOX_WARNING("File is hard linked, this may "
+                                                        "cause rename tracking to fail and "
+                                                        "move files incorrectly in your "
+                                                        "backup! " << filename << 
+                                                        ", nlink=" << file_st.st_nlink <<
+                                                        " (suppressing further warnings");
+                                                mSuppressMultipleLinksWarning = true;
+                                        }
+                                        SetErrorWhenReadingFilesystemObject(
+                                                rParams, filename.c_str());
+                                }
+
                                 BOX_TRACE("Stat entry '" << filename << "' "
                                         "found device/inode " <<
                                         file_st.st_dev << "/" <<
                                         file_st.st_ino);
-
-                                int type = file_st.st_mode & S_IFMT;
 
                                 /* Workaround for apparent btrfs bug, where

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h

@@ -157 +157 @@
         bool            mInitialSyncDone;
         bool            mSyncDone;
+        bool            mSuppressMultipleLinksWarning;
 
         // Checksum of directory contents and attributes, used to detect changes