Changeset 2315

Timestamp:

03/10/2008 23:43:17 (3 years ago)

Author:

chris

Message:

Log creation of directory records and warn on conflicting records.

File:

• box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (3 diffs)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -1079 +1079 @@
                         {
                                 // Use this one
+                                BOX_TRACE("Storing uploaded file ID " << inodeNum << " (" << filename << " in ID map as object " << latestObjectID << " with parent " << mObjectID << " (" << rLocalPath << ")");
                                 idMap.AddToMap(inodeNum, latestObjectID, mObjectID /* containing directory */);
                         }
@@ -1090 +1091 @@
                                 {
                                         // Found
+                                        if (dirid != mObjectID)
+                                        {
+                                                BOX_WARNING("Found conflicting parent ID for file ID " << inodeNum << " (" << filename << "): expected " << mObjectID << " (" << rLocalPath << ") but found " << dirid << " (same directory used in two different locations?)");
+                                        }
+
                                         ASSERT(dirid == mObjectID);
+
                                         // NOTE: If the above assert fails, an inode number has been reused by the OS,
                                         // or there is a problem somewhere. If this happened on a short test run, look
@@ -1096 +1103 @@
                                         // not indicate anything wrong.
                                         // Run the release version for real life use, where this check is not made.
+                                        BOX_TRACE("Storing found file ID " << inodeNum << " (" << filename << " in ID map as object " << latestObjectID << " with parent " << mObjectID << " (" << rLocalPath << ")");
                                         idMap.AddToMap(inodeNum, objid, mObjectID /* containing directory */);                          
                                 }