Making a send synchronous

wrench-project · Oct 16, 2024 · 426ae35 · 426ae35
1 parent 8a11923
commit 426ae35
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/wrench/services/storage/simple/SimpleStorageService.cpp b/src/wrench/services/storage/simple/SimpleStorageService.cpp
@@ -193,12 +193,16 @@ namespace wrench {
 
         bool file_found = this->file_system->file_exists(location->getFilePath());
 
-        answer_commport->dputMessage(
-                new StorageServiceFileLookupAnswerMessage(
-                        location->getFile(),
-                        file_found,
-                        this->getMessagePayloadValue(
-                                SimpleStorageServiceMessagePayload::FILE_LOOKUP_ANSWER_MESSAGE_PAYLOAD)));
+        try {
+            // Synchronous so that it won't be overtaken by an MQ message
+            answer_commport->putMessage(
+                    new StorageServiceFileLookupAnswerMessage(
+                            location->getFile(),
+                            file_found,
+                            this->getMessagePayloadValue(
+                                    SimpleStorageServiceMessagePayload::FILE_LOOKUP_ANSWER_MESSAGE_PAYLOAD)));
+        } catch (ExecutionException &ignore) {} // Oh, well
+
         return true;
     }
 

diff --git a/test/workflow/WorkflowFileTest.cpp b/test/workflow/WorkflowFileTest.cpp
@@ -19,9 +19,11 @@ TEST(DataFileTest, FileStructure) {
     ASSERT_EQ(f1->getID(), "file-01");
     ASSERT_EQ(f1->getSize(), 100);
 
-    ASSERT_EQ(wrench::Simulation::addFile("file-02", "100MB")->getSize(), 100000000ULL);
-    ASSERT_EQ(wrench::Simulation::addFile("file-03", "100MiB")->getSize(), 100ULL * 1024ULL * 1024ULL);
-    ASSERT_THROW(wrench::Simulation::addFile("file-03", "100MXiB")->getSize(), std::invalid_argument);
+    auto size2 = wrench::Simulation::addFile("file-02", "100MB")->getSize();
+    ASSERT_EQ(size2, 100000000ULL);
+    auto size3 = wrench::Simulation::addFile("file-03", "100MiB")->getSize();
+    ASSERT_EQ(size3, 100ULL * 1024ULL * 1024ULL);
+    ASSERT_THROW(wrench::Simulation::addFile("file-04", "100MXiB"), std::invalid_argument);
 
     workflow->clear();
     wrench::Simulation::removeAllFiles();