From 8cdda2e40119ce100c7400456973994cd6721fc9 Mon Sep 17 00:00:00 2001
From: Thomas Brady <thomas.brady@stellar.org>
Date: Mon, 21 Oct 2024 15:44:18 -0700
Subject: [PATCH] Revert downgrading of log error->warn->error use const error
 message POSSIBLY_CORRUPTED_HISTORY, add more guidance

---
 src/historywork/CheckSingleLedgerHeaderWork.cpp | 14 +++++++++++---
 src/main/ErrorMessages.h                        |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/historywork/CheckSingleLedgerHeaderWork.cpp b/src/historywork/CheckSingleLedgerHeaderWork.cpp
index 770807ed7a..677ccba36a 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"
@@ -84,9 +85,16 @@ CheckSingleLedgerHeaderWork::doWork()
     }
     else if (mGetLedgerFileWork->getState() != State::WORK_SUCCESS)
     {
-        CLOG_WARNING(History,
-                     "Failed to download ledger checkpoint {} from archive {}",
-                     mFt->baseName_gz(), mArchive->getName());
+        CLOG_ERROR(
+            History,
+            "Failed to download ledger checkpoint {} from archive {}: {}",
+            mFt->baseName_gz(), mArchive->getName(),
+            POSSIBLY_CORRUPTED_HISTORY);
+        CLOG_ERROR(
+            History,
+            "If this occurs often, consider notifying the archive "
+            "owner. As long as your configuration has any valid history "
+            "archives, this error does NOT mean your node is unhealthy.");
         return mGetLedgerFileWork->getState();
     }
 
diff --git a/src/main/ErrorMessages.h b/src/main/ErrorMessages.h
index b1a9804b48..77da341095 100644
--- a/src/main/ErrorMessages.h
+++ b/src/main/ErrorMessages.h
@@ -11,7 +11,7 @@ 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.";
 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 "