ptcomm: Correct and increase default bpipe timeout.

diff --git a/bacula/src/plugins/fd/pluginlib/ptcomm.cpp b/bacula/src/plugins/fd/pluginlib/ptcomm.cpp
index b2094fe7932a4f53edc61a204bba91e25401d05e..7e5f4ecd3a3d7c952ee9d3aea06059358eeed1e6 100644 (file)
--- a/bacula/src/plugins/fd/pluginlib/ptcomm.cpp
+++ b/bacula/src/plugins/fd/pluginlib/ptcomm.cpp
@@ -145,8 +145,8 @@ bool PTCOMM::recvbackend_data(bpContext *ctx, char *buf, int32_t nbytes)
       {
          // this means timeout waiting
          f_error = true;
-         DMSG1(ctx, DERROR, "BPIPE read timeout=%d.\n", _timeout.tv_sec);
-         JMSG1(ctx, is_fatal() ? M_FATAL : M_ERROR, "BPIPE read timeout=%d.\n", _timeout.tv_sec);
+         DMSG1(ctx, DERROR, "BPIPE read timeout=%d.\n", PTCOMM_DEFAULT_TIMEOUT);
+         JMSG1(ctx, is_fatal() ? M_FATAL : M_ERROR, "BPIPE read timeout=%d.\n", PTCOMM_DEFAULT_TIMEOUT);
          return false;
       }
 

diff --git a/bacula/src/plugins/fd/pluginlib/ptcomm.h b/bacula/src/plugins/fd/pluginlib/ptcomm.h
index 2f7260fbe41d0d0329b6f3f3ddcd989cfdb45aef..4a4e182760c963d7855a7ffc8cfd6a014df66fe8 100644 (file)
--- a/bacula/src/plugins/fd/pluginlib/ptcomm.h
+++ b/bacula/src/plugins/fd/pluginlib/ptcomm.h
@@ -24,7 +24,8 @@
 
 #include "pluginlib.h"
 
-#define PTCOMM_DEFAULT_TIMEOUT   300        // timeout waiting for data 15 min, it should be enough
+#define PTCOMM_DEFAULT_TIMEOUT   3600        // timeout waiting for data is 1H as some backends could spent it doing real work
+                                             // TODO: I think we should move it to plugin configurable variable instead of a const
 
 /*
  * The protocol packet header.