v1.0.0-rc.145 (#55)

This is an UNSTABLE release. The release has significant modifications for HDF5 writing logic - in case of troubles go back to 1.0.0-rc.144.

* **Default HDF5 writing mode is with VDS, not soft-links** - this improves DIALS compatibility and makes format more future-proof, NXmx legacy format might be phased-out in the future.
* XDS plugin: Improve performance of VDS reading.
* jfjoch_writer: Significant improvement on how file systems I/O are handled through a dedicated pass-through VFD.
* jfjoch_writer: Clean-up of HDF5 routines to better handle issues.

Reviewed-on: #55

writer/StreamWriter.cpp

@@ -173,26 +173,40 @@ void StreamWriter::ProcessEndMessage() {
     NotifyTcpAck(TCPFrameType::END, !error_state, error_state,
                  error_state ? TCPAckCode::EndFailed : TCPAckCode::None,
                  error_state ? err : "");
+
+    // To exit main image loop in CollectImages(), state must be finalized
+    state = StreamWriterState::Finalized;
 }
 
 void StreamWriter::FinalizeDataCollection() {
     end_time = std::chrono::system_clock::now();
 
+    bool finalize_error = false;
+
     if (file_writer && (state != StreamWriterState::Error)) {
         try {
             hdf5_data_file_statistics = file_writer->Finalize();
-        } catch (JFJochException &e) {
+        } catch (const JFJochException &e) {
+            finalize_error = true;
             state = StreamWriterState::Error;
             err = e.what();
             logger.ErrorException(e);
             logger.Error("Error finalizing writing - switching to error state");
+        } catch (const std::exception &e) {
+            finalize_error = true;
+            state = StreamWriterState::Error;
+            err = e.what();
+            logger.Error("Error finalizing writing - switching to error state: {}", e.what());
         }
     } else {
         hdf5_data_file_statistics.clear();
     }
+
     file_writer.reset();
     logger.Info("Data writing finished");
-    state = StreamWriterState::Finalized;
+
+    if (!finalize_error && state != StreamWriterState::Error)
+        state = StreamWriterState::Finalized;
 }
 
 void StreamWriter::CollectImages() {
@@ -206,9 +220,13 @@ void StreamWriter::CollectImages() {
         if (image_puller_output.tcp_msg &&
             static_cast<TCPFrameType>(image_puller_output.tcp_msg->header.type) == TCPFrameType::CANCEL) {
             logger.Warning("Received TCP CANCEL, finalizing data collection");
-            if (state != StreamWriterState::Idle && state != StreamWriterState::Finalized)
+            if (state != StreamWriterState::Idle)
                 FinalizeDataCollection();
-            NotifyTcpAck(TCPFrameType::CANCEL, true, false, TCPAckCode::None);
+            const bool error_state = (state == StreamWriterState::Error);
+            NotifyTcpAck(TCPFrameType::CANCEL, !error_state, error_state,
+                         error_state ? TCPAckCode::EndFailed : TCPAckCode::None,
+                         error_state ? err : "");
+
             state = StreamWriterState::Finalized;
             continue;
         }