From 7878eae95ec94ca97f5f8258468c21b283c1f010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Thu, 10 Feb 2022 08:51:48 +0200
Subject: [PATCH] Small fixes   Add new requirement for pv tool for debian and
 rpm   Fix one test result difference.   Set message about missing progress
 reporting tool pv as info.

---
 cmake/cpack_rpm.cmake            | 1 +
 debian/control                   | 3 ++-
 scripts/wsrep_sst_mariabackup.sh | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index c3c7cb78765..0470ff893e6 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -226,6 +226,7 @@ IF(WITH_WSREP)
   SETA(CPACK_RPM_server_PACKAGE_REQUIRES
     "galera-4" "rsync" "lsof" "grep" "gawk" "iproute"
     "coreutils" "findutils" "tar")
+  SETA(CPACK_RPM_server_PACKAGE_RECOMMENDS "pv")
 ENDIF()
 
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
diff --git a/debian/control b/debian/control
index 00ebcf6d801..c5c5edc2b32 100644
--- a/debian/control
+++ b/debian/control
@@ -658,7 +658,8 @@ Architecture: any
 Suggests: mailx,
           mariadb-test,
           netcat-openbsd
-Recommends: libhtml-template-perl
+Recommends: libhtml-template-perl,
+            pv
 Pre-Depends: adduser (>= 3.40),
              debconf,
              mariadb-common (>= ${source:Version})
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index bfb42d53b1c..26ee0a077be 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -457,8 +457,8 @@ get_footprint()
 adjust_progress()
 {
     if [ -z "$(commandex pv)" ]; then
-        wsrep_log_error "pv not found in path: $PATH"
-        wsrep_log_error "Disabling all progress/rate-limiting"
+        wsrep_log_info "Progress reporting tool pv not found in path: $PATH"
+        wsrep_log_info "Disabling all progress/rate-limiting"
         pcmd=""
         rlimit=""
         progress=""