Don't allow Container insertion in READ_LINEAR (#1590)

Also clear the IO queue after failed flushes
openPMD · Jan 30, 2024 · d9fce66 · d9fce66
1 parent 8faadde
commit d9fce66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/openPMD/backend/Container.hpp b/include/openPMD/backend/Container.hpp
@@ -21,6 +21,7 @@
 #pragma once
 
 #include "openPMD/Error.hpp"
+#include "openPMD/IO/Access.hpp"
 #include "openPMD/backend/Attributable.hpp"
 
 #include <initializer_list>
@@ -289,7 +290,7 @@ class Container : virtual public Attributable
         {
             if (IOHandler()->m_seriesStatus !=
                     internal::SeriesStatus::Parsing &&
-                Access::READ_ONLY == IOHandler()->m_frontendAccess)
+                access::readOnly(IOHandler()->m_frontendAccess))
             {
                 auxiliary::OutOfRangeMsg const out_of_range_msg;
                 throw std::out_of_range(out_of_range_msg(key));
@@ -330,7 +331,7 @@ class Container : virtual public Attributable
         {
             if (IOHandler()->m_seriesStatus !=
                     internal::SeriesStatus::Parsing &&
-                Access::READ_ONLY == IOHandler()->m_frontendAccess)
+                access::readOnly(IOHandler()->m_frontendAccess))
             {
                 auxiliary::OutOfRangeMsg out_of_range_msg;
                 throw std::out_of_range(out_of_range_msg(key));

diff --git a/src/Series.cpp b/src/Series.cpp
@@ -737,7 +737,12 @@ std::future<void> Series::flush_impl(
     }
     catch (...)
     {
-        IOHandler()->m_lastFlushSuccessful = false;
+        auto handler = IOHandler();
+        handler->m_lastFlushSuccessful = false;
+        while (!handler->m_work.empty())
+        {
+            handler->m_work.pop();
+        }
         throw;
     }
 }