Changeset 2968

Timestamp:

16/06/2011 16:45:26 (11 months ago)

Author:

chris

Message:

Improve error logging for store info and refcount database errors.

Location:

box/trunk/lib/backupstore

Files:

• BackupStoreInfo.cpp (modified) (4 diffs)
• BackupStoreRefCountDatabase.cpp (modified) (5 diffs)

box/trunk/lib/backupstore/BackupStoreInfo.cpp

@@ -142 +142 @@
 //
 // --------------------------------------------------------------------------
-std::auto_ptr<BackupStoreInfo> BackupStoreInfo::Load(int32_t AccountID, const std::string &rRootDir, int DiscSet, bool ReadOnly, int64_t *pRevisionID)
+std::auto_ptr<BackupStoreInfo> BackupStoreInfo::Load(int32_t AccountID,
+        const std::string &rRootDir, int DiscSet, bool ReadOnly,
+        int64_t *pRevisionID)
 {
         // Generate the filename
@@ -154 +156 @@
         if(!rf->ReadFullBuffer(&magic, sizeof(magic), 0))
         {
-                THROW_EXCEPTION(BackupStoreException, CouldNotLoadStoreInfo);
+                THROW_FILE_ERROR("Failed to read store info file: "
+                        "short read of magic number", fn,
+                        BackupStoreException, CouldNotLoadStoreInfo);
         }
 
@@ -169 +173 @@
         else
         {
-                THROW_EXCEPTION(BackupStoreException, BadStoreInfoOnLoad)
+                THROW_FILE_ERROR("Failed to read store info file: "
+                        "unknown magic " << BOX_FORMAT_HEX32(ntohl(magic)),
+                        fn, BackupStoreException, BadStoreInfoOnLoad);
         }
 
@@ -224 +230 @@
                 if (FileAccountID != AccountID)
                 {
-                        THROW_FILE_ERROR("Found wrong account ID in store info",
+                        THROW_FILE_ERROR("Found wrong account ID in store "
+                                "info: " << BOX_FORMAT_HEX32(FileAccountID),
                                 fn, BackupStoreException, BadStoreInfoOnLoad);
                 }

box/trunk/lib/backupstore/BackupStoreRefCountDatabase.cpp

@@ -92 +92 @@
         if (FileExists(Filename) && !AllowOverwrite)
         {
-                BOX_ERROR("Attempted to overwrite refcount database file: " <<
-                        Filename);
-                THROW_EXCEPTION(RaidFileException, CannotOverwriteExistingFile);
+                THROW_FILE_ERROR("Failed to overwrite refcount database: "
+                        "not allowed here", Filename, RaidFileException,
+                        CannotOverwriteExistingFile);
         }
 
@@ -135 +135 @@
         if(!dbfile->ReadFullBuffer(&hdr, sizeof(hdr), 0 /* not interested in bytes read if this fails */))
         {
-                THROW_EXCEPTION(BackupStoreException, CouldNotLoadStoreInfo)
+                THROW_FILE_ERROR("Failed to read refcount database: "
+                        "short read", filename, BackupStoreException,
+                        CouldNotLoadStoreInfo);
         }
         
@@ -142 +144 @@
                 (int32_t)ntohl(hdr.mAccountID) != rAccount.GetID())
         {
-                THROW_EXCEPTION(BackupStoreException, BadStoreInfoOnLoad)
+                THROW_FILE_ERROR("Failed to read refcount database: "
+                        "bad magic number", filename, BackupStoreException,
+                        BadStoreInfoOnLoad);
         }
         
@@ -256 +260 @@
         if (GetSize() < offset + GetEntrySize())
         {
-                BOX_ERROR("attempted read of unknown refcount for object " <<
-                        BOX_FORMAT_OBJECTID(ObjectID));
-                THROW_EXCEPTION(BackupStoreException,
-                        UnknownObjectRefCountRequested);
+                THROW_FILE_ERROR("Failed to read refcount database: "
+                        "attempted read of unknown refcount for object " <<
+                        BOX_FORMAT_OBJECTID(ObjectID), mFilename,
+                        BackupStoreException, UnknownObjectRefCountRequested);
         }
 
@@ -268 +272 @@
                 sizeof(refcount))
         {
-                BOX_LOG_SYS_ERROR("short read on refcount database: " <<
-                        mFilename);
-                THROW_EXCEPTION(BackupStoreException, CouldNotLoadStoreInfo);
+                THROW_FILE_ERROR("Failed to read refcount database: "
+                        "short read at offset " << offset, mFilename,
+                        BackupStoreException, CouldNotLoadStoreInfo);
         }