From: Bill Erickson <berickxx@gmail.com>
Date: Sat, 3 Dec 2022 18:55:22 +0000 (-0500)
Subject: LP2017941 Add some bus failure handling
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bb8625c953bb91e46fb4f18a0f988454b9faf32a;p=working%2FOpenSRF.git

LP2017941 Add some bus failure handling

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/src/libopensrf/transport_connection.c b/src/libopensrf/transport_connection.c
index d3f12cb..1bef22e 100644
--- a/src/libopensrf/transport_connection.c
+++ b/src/libopensrf/transport_connection.c
@@ -1,4 +1,5 @@
 #include <opensrf/transport_connection.h>
+#include<unistd.h>
 
 transport_con* transport_con_new(const char* domain) {
 
@@ -253,5 +254,13 @@ int handle_redis_error(redisReply *reply, const char* command, ...) {
     osrfLogError(OSRF_LOG_MARK, "REDIS Error [%s] %s", err, VA_BUF);
     freeReplyObject(reply);
 
+    // Some bus error conditions can lead to looping on an unusable
+    // connection.  Avoid flooding the logs by inserting a short
+    // wait after any Redis errors.  Note, these should never happen
+    // under normal wear and tear.  It's possible we should just exit
+    // here, but need to collect some data first.
+    osrfLogError(OSRF_LOG_MARK, "Resting for a few seconds after bus failure...");
+    sleep(3);
+
     return 1;
 }
diff --git a/src/perl/lib/OpenSRF/Transport/Redis/BusConnection.pm b/src/perl/lib/OpenSRF/Transport/Redis/BusConnection.pm
index 03e4aae..a93b705 100644
--- a/src/perl/lib/OpenSRF/Transport/Redis/BusConnection.pm
+++ b/src/perl/lib/OpenSRF/Transport/Redis/BusConnection.pm
@@ -107,7 +107,11 @@ sub send {
 
     eval { $self->redis->rpush($dest_stream, $msg_json) };
 
-    if ($@) { $logger->error("RPUSH error: $@"); }
+    if ($@) { 
+        $logger->error("RPUSH error: $@"); 
+        $logger->error("BusConnection pausing for a few seconds after bus error");
+        sleep(3);
+    }
 }
 
 # $timeout=0 means check for data without blocking