socket-server: wait 250ms before trying TLS handshake

- try to solve the race condition when running a backup on FreeBSD - the psk-callback cannot find the psk for the storage in the respective job control record
bareos · Dec 14, 2018 · d1f16be · d1f16be
1 parent afb5bdf
commit d1f16be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/core/src/dird/socket_server.cc b/core/src/dird/socket_server.cc
@@ -77,6 +77,8 @@ static void *HandleConnectionRequest(ConfigurationParser *config, void *arg)
 
   jcr.ua = bs;
 
+  Bmicrosleep(0,250000);
+
   if (!TryTlsHandshakeAsAServer(bs, config)) {
     bs->signal(BNET_TERMINATE);
     bs->close();

diff --git a/core/src/filed/socket_server.cc b/core/src/filed/socket_server.cc
@@ -59,6 +59,8 @@ static void *HandleConnectionRequest(ConfigurationParser *config, void *arg)
 {
    BareosSocket *bs = (BareosSocket *)arg;
 
+   Bmicrosleep(0,250000);
+
    if (!TryTlsHandshakeAsAServer(bs, config)) {
      bs->signal(BNET_TERMINATE);
      bs->close();

diff --git a/core/src/stored/socket_server.cc b/core/src/stored/socket_server.cc
@@ -67,6 +67,8 @@ void *HandleConnectionRequest(ConfigurationParser *config, void *arg)
   char name[MAX_NAME_LENGTH];
   char tbuf[MAX_TIME_LENGTH];
 
+  Bmicrosleep(0,250000);
+
   if (!TryTlsHandshakeAsAServer(bs, config)) {
     bs->signal(BNET_TERMINATE);
     bs->close();