Changeset 2861 for box/trunk/lib

Timestamp:

23/02/2011 23:51:29 (15 months ago)

Author:

chris

Message:

Debugging for Sune Molgaard's issue with non-existent files being
detected as unattached and crashing later in CheckUnattachedObjects?().

Location:

box/trunk/lib/backupstore

Files:

• BackupStoreCheck.cpp (modified) (2 diffs)
• BackupStoreCheck2.cpp (modified) (1 diff)

box/trunk/lib/backupstore/BackupStoreCheck.cpp

@@ -465 +465 @@
         int64_t size = -1;
 
+        // Debugging for Sune Molgaard's issue with non-existent files being
+        // detected as unattached and crashing later in CheckUnattachedObjects()
+        if (ObjectID == 0x90c1a)
+        {
+                BOX_INFO("Trying to open " << BOX_FORMAT_OBJECTID(ObjectID) <<
+                        " from " << rFilename << " on disc " << mDiscSetNumber);
+        }
+
         try
         {
@@ -523 +531 @@
                 return false;
         }
-        
+
+        // Debugging for Sune Molgaard's issue with non-existent files being
+        // detected as unattached and crashing later in CheckUnattachedObjects()
+        if (ObjectID == 0x90c1a)
+        {
+                BOX_INFO("Adding ID " << BOX_FORMAT_OBJECTID(ObjectID) <<
+                        " contained by " << BOX_FORMAT_OBJECTID(containerID) <<
+                        " with size " << size << " and isFile " << isFile);
+        }
+
         // Add to list of IDs known about
         AddID(ObjectID, containerID, size, isFile);

box/trunk/lib/backupstore/BackupStoreCheck2.cpp

@@ -158 +158 @@
                                                 std::string filename;
                                                 StoreStructure::MakeObjectFilename(pblock->mID[e], mStoreRoot, mDiscSetNumber, filename, false /* don't attempt to make sure the dir exists */);
+
+                                                // Debugging for Sune Molgaard's issue with non-existent files being
+                                                // detected as unattached and crashing later in CheckUnattachedObjects()
+                                                if (pblock->mID[e] == 0x90c1a)
+                                                {
+                                                        BOX_INFO("Trying to open unattached " <<
+                                                                BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+                                                                " from " << filename << " on " << mDiscSetNumber);
+                                                }
+
                                                 // The easiest way to do this is to verify it again. Not such a bad penalty, because
                                                 // this really shouldn't be done very often.