Changeset 2543 for box/trunk

Timestamp:

05/07/2009 22:43:57 (3 years ago)

Author:

chris

Message:

Allow RaidFileWrite? to test that the reference count of an object is
correct before overwriting or deleting it.

Location:

box/trunk

Files:

• lib/raidfile/RaidFileException.txt (modified) (1 diff)
• lib/raidfile/RaidFileWrite.cpp (modified) (4 diffs)
• lib/raidfile/RaidFileWrite.h (modified) (2 diffs)
• test/raidfile/testraidfile.cpp (modified) (1 diff)

box/trunk/lib/raidfile/RaidFileException.txt

@@ -24 +24 @@
 ErrorOpeningWriteFileOnTruncate 21
 FileIsCurrentlyOpenForWriting   22
+RequestedModifyUnreferencedFile 23      Internal error: the server attempted to modify a file which has no references.
+RequestedModifyMultiplyReferencedFile   24      Internal error: the server attempted to modify a file which has multiple references.
+RequestedDeleteReferencedFile   25      Internal error: the server attempted to delete a file which is still referenced.

box/trunk/lib/raidfile/RaidFileWrite.cpp

@@ -43 +43 @@
 // Function
 //              Name:    RaidFileWrite::RaidFileWrite(int, const std::string &)
-//              Purpose: Construtor, just stores requried details
+//              Purpose: Simple constructor, just stores required details
 //              Created: 2003/07/10
 //
@@ -50 +50 @@
         : mSetNumber(SetNumber),
           mFilename(Filename),
-          mOSFileHandle(-1)             // not valid file handle
-{
+          mOSFileHandle(-1), // not valid file handle
+          mRefCount(-1) // unknown refcount
+{
+}
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    RaidFileWrite::RaidFileWrite(int,
+//                       const std::string &, int refcount)
+//              Purpose: Constructor with check for overwriting file
+//                       with multiple references
+//              Created: 2009/07/05
+//
+// --------------------------------------------------------------------------
+RaidFileWrite::RaidFileWrite(int SetNumber, const std::string &Filename,
+        int refcount)
+        : mSetNumber(SetNumber),
+          mFilename(Filename),
+          mOSFileHandle(-1),            // not valid file handle
+          mRefCount(refcount)
+{
+        // Can't check for zero refcount here, because it's legal
+        // to create a RaidFileWrite to delete an object with zero refcount.
+        // Check in Commit() and Delete() instead.
+        if (refcount > 1)
+        {
+                BOX_ERROR("Attempted to modify object " << mFilename <<
+                        ", which has " << refcount << " references");
+                THROW_EXCEPTION(RaidFileException,
+                        RequestedModifyMultiplyReferencedFile);
+        }
 }
 
@@ -251 +281 @@
                 THROW_EXCEPTION(RaidFileException, NotOpen)
         }
-        
+
+        if (mRefCount == 0)
+        {
+                BOX_ERROR("Attempted to modify object " << mFilename << 
+                        ", which has no references");
+                THROW_EXCEPTION(RaidFileException,
+                        RequestedModifyUnreferencedFile);
+        }
+
         // Rename it into place -- BEFORE it's closed so lock remains
 
@@ -639 +677 @@
 void RaidFileWrite::Delete()
 {
+        if (mRefCount != 0 && mRefCount != -1)
+        {
+                BOX_ERROR("Attempted to delete object " << mFilename <<
+                        " which has " << mRefCount << " references");
+                THROW_EXCEPTION(RaidFileException,
+                        RequestedDeleteReferencedFile);
+        }
+
         // Get disc set
         RaidFileController &rcontroller(RaidFileController::GetController());

box/trunk/lib/raidfile/RaidFileWrite.h

@@ -29 +29 @@
 public:
         RaidFileWrite(int SetNumber, const std::string &Filename);
+        RaidFileWrite(int SetNumber, const std::string &Filename, int refcount);
         ~RaidFileWrite();
 private:
@@ -61 +62 @@
         std::string mFilename;
         int mOSFileHandle;
+        int mRefCount;
 };
 

box/trunk/test/raidfile/testraidfile.cpp

@@ -628 +628 @@
         }
 
+        // Test that creating and deleting a RaidFile with the wrong
+        // reference counts throws the expected errors.
+        {
+                RaidFileWrite write1(0, "write1", 1);
+                write1.Open();
+                write1.Commit();
+                TEST_CHECK_THROWS(write1.Delete(), RaidFileException,
+                        RequestedDeleteReferencedFile);
+        }
+
+        {
+                RaidFileWrite write1(0, "write1", 0);
+                write1.Open(true);
+                TEST_CHECK_THROWS(write1.Commit(), RaidFileException,
+                        RequestedModifyUnreferencedFile);
+                write1.Delete();
+        }
+
+        {
+                TEST_CHECK_THROWS(RaidFileWrite write1(0, "write1", 2),
+                        RaidFileException,
+                        RequestedModifyMultiplyReferencedFile);
+        }
+
         // Create a RaidFile
         RaidFileWrite write1(0, "test1");