From 9c30d746b9cd19117abfb3889f0a9fffb0b15d92 Mon Sep 17 00:00:00 2001
From: Thomas Brady <thomas.brady@stellar.org>
Date: Wed, 23 Oct 2024 15:03:47 -0700
Subject: [PATCH] Const error message POSSIBLY_CORRUPTED_HISTORY, add more
 guidance

---
 src/historywork/CheckSingleLedgerHeaderWork.cpp | 13 ++++---------
 src/main/ErrorMessages.h                        |  7 ++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/historywork/CheckSingleLedgerHeaderWork.cpp b/src/historywork/CheckSingleLedgerHeaderWork.cpp
index 00f44911e6..f132822070 100644
--- a/src/historywork/CheckSingleLedgerHeaderWork.cpp
+++ b/src/historywork/CheckSingleLedgerHeaderWork.cpp
@@ -7,6 +7,7 @@
 #include "history/HistoryArchive.h"
 #include "history/HistoryManager.h"
 #include "historywork/GetAndUnzipRemoteFileWork.h"
+#include "main/ErrorMessages.h"
 #include "util/GlobalChecks.h"
 #include "util/Logging.h"
 #include "util/TmpDir.h"
@@ -86,15 +87,9 @@ CheckSingleLedgerHeaderWork::doWork()
     {
         CLOG_ERROR(
             History,
-            "Failed to download ledger checkpoint {} from archive {}. This may "
-            "be due to transient network issues, or the archive may be missing "
-            "the checkpoint. stellar-core will try to download the file from "
-            "another archive. This error *does not* necessarily require a "
-            "configuration change to remove the archive, but please ensure you "
-            "have the correct archive for the operator in your configuration "
-            "file. If you repeatedly see this error, please notify the "
-            "operator of the archive that you are observing gaps.",
-            mFt->baseName_gz(), mArchive->getName());
+            "Failed to download ledger checkpoint {} from archive {}: {}",
+            mFt->baseName_gz(), mArchive->getName(),
+            POSSIBLY_CORRUPTED_HISTORY);
         return mGetLedgerFileWork->getState();
     }
 
diff --git a/src/main/ErrorMessages.h b/src/main/ErrorMessages.h
index b1a9804b48..00f6bbfcb1 100644
--- a/src/main/ErrorMessages.h
+++ b/src/main/ErrorMessages.h
@@ -11,7 +11,12 @@ constexpr auto const REPORT_INTERNAL_BUG =
     "Please report this bug along with this log file if this was not expected";
 constexpr auto const POSSIBLY_CORRUPTED_HISTORY =
     "One or more of history archives may be corrupted. Update HISTORY "
-    "configuration entry to only contain valid ones";
+    "configuration entry to only contain valid ones. If you have a valid "
+    "HISTORY configuration entry for the archive and repeatedly see this "
+    "error, please notify the operator of the archive that you are observing "
+    "gaps. Avoid removing the validator from your quorum set unless you have "
+    "coordinated with other operators and carefully considered the impact of "
+    "doing so.";
 constexpr auto const POSSIBLY_CORRUPTED_LOCAL_FS =
     "There may be a problem with the local filesystem. Ensure that there is "
     "enough space to perform that operation and that disc is behaving "