commit ce9251049395fb146b0b973a17154a8a0e8821bf
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 31 17:04:05 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 31 17:04:05 2013 -0800
tree d2635e38ac7dd6e0ec145ac2389f76af33ef8a8f
parent 1df5863224904120a3008133476f60ca714be4ee

Add sanity check for fs operations in dispatcher

Change-Id: I5d5fd5957542e8cfce040f556e42a0feb6e2e6df

src/dispatcher.cc

diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index cbd6b41..fb3a025 100644
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -384,13 +384,20 @@
     {
       boost::filesystem::path filePath = m_rootDir / file->filename ();
 
-      if (filesystem::exists (filePath) &&
-          filesystem::last_write_time (filePath) == file->mtime () &&
-          filesystem::status (filePath).permissions () == static_cast<filesystem::perms> (file->mode ()) &&
-          *Hash::FromFileContent (filePath) == hash)
+      try
         {
-          _LOG_DEBUG ("Asking to assemble a file, but file already exists on a filesystem");
-          continue;
+          if (filesystem::exists (filePath) &&
+              filesystem::last_write_time (filePath) == file->mtime () &&
+              filesystem::status (filePath).permissions () == static_cast<filesystem::perms> (file->mode ()) &&
+              *Hash::FromFileContent (filePath) == hash)
+            {
+              _LOG_DEBUG ("Asking to assemble a file, but file already exists on a filesystem");
+              continue;
+            }
+        }
+      catch (filesystem::filesystem_error &error)
+        {
+          _LOG_ERROR ("File operations failed on [" << filePath << "] (ignoring)");
         }
 
       m_objectManager.objectsToLocalFile (deviceName, hash, filePath);
@@ -412,13 +419,20 @@
   Name deviceName (file->device_name ().c_str (), file->device_name ().size ());
   Hash hash (file->file_hash ().c_str (), file->file_hash ().size ());
 
-  if (filesystem::exists (filePath) &&
-      filesystem::last_write_time (filePath) == file->mtime () &&
-      filesystem::status (filePath).permissions () == static_cast<filesystem::perms> (file->mode ()) &&
-      *Hash::FromFileContent (filePath) == hash)
+  try
     {
-      _LOG_DEBUG ("Asking to assemble a file, but file already exists on a filesystem");
-      return;
+      if (filesystem::exists (filePath) &&
+          filesystem::last_write_time (filePath) == file->mtime () &&
+          filesystem::status (filePath).permissions () == static_cast<filesystem::perms> (file->mode ()) &&
+          *Hash::FromFileContent (filePath) == hash)
+        {
+          _LOG_DEBUG ("Asking to assemble a file, but file already exists on a filesystem");
+          return;
+        }
+    }
+  catch (filesystem::filesystem_error &error)
+    {
+      _LOG_ERROR ("File operations failed on [" << filePath << "] (ignoring)");
     }
 
   m_objectManager.objectsToLocalFile (deviceName, hash, filePath);