Merge branch '1.0'

wrench-project · Jul 12, 2018 · dbd457c · dbd457c
2 parents f06a182 + cbee94a
commit dbd457c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/include/wrench/services/Service.h b/include/wrench/services/Service.h
@@ -113,10 +113,10 @@ namespace wrench {
         /** @brief The service's name */
         std::string name;
 
-        /** @brief The time (in seconds) after which a service that doesn't send back a reply message cause
-         *  a NetworkTimeOut exception. (default: 1 second; if <0 never timeout)
+        /** @brief The time (in seconds) after which a service that doesn't send back a reply (control) message causes
+         *  a NetworkTimeOut exception. (default: 30 second; if <0 never timeout)
          */
-        double network_timeout = 1.0;
+        double network_timeout = 30.0;
 
         /***********************/
         /** \endcond           */

diff --git a/src/wrench/services/storage/StorageService.cpp b/src/wrench/services/storage/StorageService.cpp
@@ -347,7 +347,7 @@ namespace wrench {
       try {
         message = S4U_Mailbox::getMessage(answer_mailbox, this->network_timeout);
       } catch (std::shared_ptr<NetworkError> &cause) {
-        throw WorkflowExecutionException(cause);
+        throw;
       }
 
       if (auto msg = dynamic_cast<StorageServiceFileReadAnswerMessage *>(message.get())) {
@@ -362,8 +362,7 @@ namespace wrench {
         try {
           file_content_message = S4U_Mailbox::getMessage(answer_mailbox);
         } catch (std::shared_ptr<NetworkError> &cause) {
-          WRENCH_INFO("Unknown Error while getting a file content.... means we should just die. but throwing");
-          throw WorkflowExecutionException(cause);
+          throw;
         }
 
         if (auto file_content_msg = dynamic_cast<StorageServiceFileContentMessage *>(file_content_message.get())) {

diff --git a/src/wrench/workflow/execution_events/FailureCause.cpp b/src/wrench/workflow/execution_events/FailureCause.cpp
@@ -336,7 +336,13 @@ namespace wrench {
       } else {
         operation = "receiving from";
       }
-      return "Network error (link failure, or communication peer died) while " + operation + " mailbox_name " + this->mailbox;
+      std::string error;
+      if (this->isTimeout()) {
+        error = "timeout";
+      } else {
+        error = "link failure, or communication peer died";
+      }
+      return "Network error (" + error + ") while " + operation + " mailbox_name " + this->mailbox;
     };
 
 //    /**