Changeset 2850 for box/trunk/lib

Timestamp:

12/01/2011 00:14:06 (17 months ago)

Author:

chris

Message:

Improve error messages on failure to open a RaidFile? for reading.

File:

• box/trunk/lib/raidfile/RaidFileRead.cpp (modified) (7 diffs)

box/trunk/lib/raidfile/RaidFileRead.cpp

@@ -1087 +1087 @@
                                 stripe2errno = errno;
                         }
-                        if(stripe1errno != 0 || stripe2errno != 0)
-                        {
-                                THROW_EXCEPTION(RaidFileException, ErrorOpeningFileForRead)
+
+                        if(stripe1errno != 0)
+                        {
+                                THROW_SYS_FILE_ERRNO("Failed to open RaidFile",
+                                        stripe1Filename, stripe1errno,
+                                        RaidFileException, ErrorOpeningFileForRead);
+                        }
+
+                        if(stripe2errno != 0)
+                        {
+                                THROW_SYS_FILE_ERRNO("Failed to open RaidFile",
+                                        stripe2Filename, stripe2errno,
+                                        RaidFileException, ErrorOpeningFileForRead);
                         }
                         
@@ -1108 +1118 @@
                         
                         // Handle errors
-                        if(stripe1errno != 0 || stripe2errno != 0)
-                        {
-                                THROW_EXCEPTION(RaidFileException, OSError)
-                        }
-                        
+                        if(stripe1errno != 0)
+                        {
+                                THROW_SYS_FILE_ERRNO("Failed to stat RaidFile",
+                                        stripe1Filename, stripe1errno,
+                                        RaidFileException, OSError);
+                        }
+
+                        if(stripe2errno != 0)
+                        {
+                                THROW_SYS_FILE_ERRNO("Failed to stat RaidFile",
+                                        stripe2Filename, stripe2errno,
+                                        RaidFileException, OSError);
+                        }
+        
                         // Make a nice object to represent this file
                         return std::auto_ptr<RaidFileRead>(new RaidFileRead_Raid(SetNumber, Filename, stripe1, stripe2, -1, length, rdiscSet.GetBlockSize(), false /* actually we don't know */));
@@ -1239 +1258 @@
                                 if(::lseek(parity, -8 /*(0 - sizeof(FileSizeType))*/, SEEK_END) == -1)
                                 {
-                                        THROW_EXCEPTION(RaidFileException, OSError)
+                                        THROW_SYS_FILE_ERROR("Failed to seek "
+                                                "in parity RaidFile",
+                                                parityFilename, 
+                                                RaidFileException, OSError);
                                 }
                                 // Read it in
                                 if(::read(parity, &parityLastData, sizeof(parityLastData)) != sizeof(parityLastData))
                                 {
-                                        THROW_EXCEPTION(RaidFileException, OSError)
-                                }
+                                        THROW_SYS_FILE_ERROR("Failed to read "
+                                                "parity RaidFile",
+                                                parityFilename, 
+                                                RaidFileException, OSError);
+                                }
+
                                 // Set back to beginning of file
                                 if(::lseek(parity, 0, SEEK_SET) == -1)
                                 {
-                                        THROW_EXCEPTION(RaidFileException, OSError)
+                                        THROW_SYS_FILE_ERROR("Failed to seek "
+                                                "in parity RaidFile",
+                                                parityFilename, 
+                                                RaidFileException, OSError);
                                 }
                         }
@@ -1272 +1301 @@
                                         if(::fstat(stripe1, &st) != 0)
                                         {
-                                                THROW_EXCEPTION(RaidFileException, OSError)
+                                                THROW_SYS_FILE_ERROR("Failed to "
+                                                        "stat RaidFile stripe 1",
+                                                        stripe1Filename,
+                                                        RaidFileException, OSError);
                                         }
                                         pos_type stripe1Size = st.st_size;
@@ -1306 +1338 @@
                                                         if(::lseek(stripe1, 0 - btr, SEEK_END) == -1)
                                                         {
-                                                                THROW_EXCEPTION(RaidFileException, OSError)
+                                                                THROW_SYS_FILE_ERROR("Failed to "
+                                                                        "seek in RaidFile stripe 1",
+                                                                        stripe1Filename,
+                                                                        RaidFileException, OSError);
                                                         }
                                                         // Read it in
                                                         if(::read(stripe1, &stripe1LastData, btr) != btr)
                                                         {
-                                                                THROW_EXCEPTION(RaidFileException, OSError)
+                                                                THROW_SYS_FILE_ERROR("Failed to "
+                                                                        "read RaidFile stripe 1",
+                                                                        stripe1Filename,
+                                                                        RaidFileException, OSError);
                                                         }
                                                         // Set back to beginning of file
                                                         if(::lseek(stripe1, 0, SEEK_SET) == -1)
                                                         {
-                                                                THROW_EXCEPTION(RaidFileException, OSError)
+                                                                THROW_SYS_FILE_ERROR("Failed to "
+                                                                        "seek in RaidFile stripe 1",
+                                                                        stripe1Filename,
+                                                                        RaidFileException, OSError);
                                                         }
                                                 }
@@ -1338 +1379 @@
                                         if(::fstat(stripe2, &st) != 0)
                                         {
-                                                THROW_EXCEPTION(RaidFileException, OSError)
+                                                THROW_SYS_FILE_ERROR("Failed to "
+                                                        "stat RaidFile stripe 2",
+                                                        stripe2Filename,
+                                                        RaidFileException, OSError);
                                         }
                                         pos_type stripe2Size = st.st_size;
@@ -1407 +1451 @@
         }
         
-        THROW_EXCEPTION(RaidFileException, FileIsDamagedNotRecoverable)
+        THROW_FILE_ERROR("Failed to recover RaidFile", Filename,
+                RaidFileException, FileIsDamagedNotRecoverable);
         
         // Avoid compiler warning -- it'll never get here...