8765ef2c32
- All agents: use grep -E/-F - Filesystem: dont report warnings when creating resource - storage-mon: fix daemon mode bug that caused delayed initial score Resolves: RHEL-72954, RHEL-75574, RHEL-76007, RHEL-76037
244 lines
9.3 KiB
Diff
244 lines
9.3 KiB
Diff
From 618ee5d013b6f4caeb703ffee6d2d696db887a1f Mon Sep 17 00:00:00 2001
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
Date: Tue, 21 Jan 2025 10:07:46 +0100
|
|
Subject: [PATCH] All agents: use detected grep -E/-F instead of egrep/fgrep
|
|
when detected
|
|
|
|
---
|
|
configure.ac | 4 ++--
|
|
heartbeat/IPaddr2 | 2 +-
|
|
heartbeat/ManageVE.in | 2 +-
|
|
heartbeat/SAPInstance | 2 +-
|
|
heartbeat/VirtualDomain | 4 ++--
|
|
heartbeat/WAS | 2 +-
|
|
heartbeat/WAS6 | 2 +-
|
|
heartbeat/docker | 2 +-
|
|
heartbeat/eDir88.in | 2 +-
|
|
heartbeat/mysql-proxy | 2 +-
|
|
heartbeat/portblock | 2 +-
|
|
heartbeat/rabbitmq-server-ha | 2 +-
|
|
heartbeat/sapdb.sh | 2 +-
|
|
heartbeat/smb-share.in | 4 ++--
|
|
heartbeat/symlink | 2 +-
|
|
15 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 951a05430f..bb2bbaded2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -492,12 +492,12 @@ AC_PATH_PROGS(TEST, test)
|
|
AC_PATH_PROGS(PING, ping, /bin/ping)
|
|
AC_PATH_PROGS(IFCONFIG, ifconfig, /sbin/ifconfig)
|
|
AC_PATH_PROGS(MAILCMD, mailx mail, mail)
|
|
-AC_PATH_PROGS(EGREP, egrep)
|
|
AC_PATH_PROGS(RM, rm)
|
|
+AC_PROG_EGREP
|
|
+AC_PROG_FGREP
|
|
|
|
AC_SUBST(BASH_SHELL)
|
|
AC_SUBST(MAILCMD)
|
|
-AC_SUBST(EGREP)
|
|
AC_SUBST(SHELL)
|
|
AC_SUBST(PING)
|
|
AC_SUBST(RM)
|
|
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
|
index 27cae2d11a..489826b814 100755
|
|
--- a/heartbeat/IPaddr2
|
|
+++ b/heartbeat/IPaddr2
|
|
@@ -1028,7 +1028,7 @@ ip_served() {
|
|
echo "partial2"
|
|
return 0
|
|
fi
|
|
- if egrep -q "(^|,)${IP_INC_NO}(,|$)" $IP_CIP_FILE ; then
|
|
+ if $EGREP -q "(^|,)${IP_INC_NO}(,|$)" $IP_CIP_FILE ; then
|
|
echo "ok"
|
|
return 0
|
|
else
|
|
diff --git a/heartbeat/ManageVE.in b/heartbeat/ManageVE.in
|
|
index f07ca5bdc6..540addd946 100644
|
|
--- a/heartbeat/ManageVE.in
|
|
+++ b/heartbeat/ManageVE.in
|
|
@@ -273,7 +273,7 @@ esac
|
|
declare -i veidtest1=$?
|
|
|
|
# really a number?
|
|
-`echo "$OCF_RESKEY_veid" | egrep -q '^[[:digit:]]+$'`
|
|
+`echo "$OCF_RESKEY_veid" | $EGREP -q '^[[:digit:]]+$'`
|
|
|
|
if [[ $veidtest1 != 1 || $? != 0 ]]; then
|
|
ocf_log err "OCF_RESKEY_veid not set or not a number."
|
|
diff --git a/heartbeat/SAPInstance b/heartbeat/SAPInstance
|
|
index 26fd541361..95140e9c45 100755
|
|
--- a/heartbeat/SAPInstance
|
|
+++ b/heartbeat/SAPInstance
|
|
@@ -795,7 +795,7 @@ sapinstance_monitor() {
|
|
esac
|
|
|
|
SEARCH=`echo "$OCF_RESKEY_MONITOR_SERVICES" | sed 's/\+/\\\+/g' | sed 's/\./\\\./g'`
|
|
- if [ `echo "$SERVICE" | egrep -c "$SEARCH"` -eq 1 ]
|
|
+ if [ `echo "$SERVICE" | $EGREP -c "$SEARCH"` -eq 1 ]
|
|
then
|
|
if [ $STATE -eq $OCF_NOT_RUNNING ]
|
|
then
|
|
diff --git a/heartbeat/VirtualDomain b/heartbeat/VirtualDomain
|
|
index 3905695ae1..7db42bd12e 100755
|
|
--- a/heartbeat/VirtualDomain
|
|
+++ b/heartbeat/VirtualDomain
|
|
@@ -975,7 +975,7 @@ VirtualDomain_migrate_to() {
|
|
sed "s/%n/$target_node/g"`
|
|
|
|
# extract migrationuri from options
|
|
- elif echo "$migrate_opts" | fgrep -qs -- "--migrateuri="; then
|
|
+ elif echo "$migrate_opts" | $FGREP -qs -- "--migrateuri="; then
|
|
migrateuri=`echo "$migrate_opts" |
|
|
sed "s/.*--migrateuri=\([^ ]*\).*/\1/;s/%n/$target_node/g"`
|
|
|
|
@@ -1148,7 +1148,7 @@ VirtualDomain_getconfig() {
|
|
VIRSH_OPTIONS="--connect=${OCF_RESKEY_hypervisor} --quiet"
|
|
|
|
# Retrieve the domain name from the xml file.
|
|
- DOMAIN_NAME=`egrep '[[:space:]]*<name>.*</name>[[:space:]]*$' ${OCF_RESKEY_config} 2>/dev/null | sed -e 's/[[:space:]]*<name>\(.*\)<\/name>[[:space:]]*$/\1/'`
|
|
+ DOMAIN_NAME=`$EGREP '[[:space:]]*<name>.*</name>[[:space:]]*$' ${OCF_RESKEY_config} 2>/dev/null | sed -e 's/[[:space:]]*<name>\(.*\)<\/name>[[:space:]]*$/\1/'`
|
|
|
|
EMULATOR_STATE="${HA_RSCTMP}/VirtualDomain-${DOMAIN_NAME}-emu.state"
|
|
}
|
|
diff --git a/heartbeat/WAS b/heartbeat/WAS
|
|
index 15b56e99e0..44aa83e20a 100755
|
|
--- a/heartbeat/WAS
|
|
+++ b/heartbeat/WAS
|
|
@@ -227,7 +227,7 @@ WASPortInfo() {
|
|
esac
|
|
PortCount=`expr $PortCount + 1`
|
|
done
|
|
- netstat -ltnp 2>/dev/null| egrep -i "($pat) .*LISTEN" | sed 's%.*LISTEN *%%'
|
|
+ netstat -ltnp 2>/dev/null| $EGREP -i "($pat) .*LISTEN" | sed 's%.*LISTEN *%%'
|
|
}
|
|
|
|
#
|
|
diff --git a/heartbeat/WAS6 b/heartbeat/WAS6
|
|
index 9e18cd682d..e71eec9305 100755
|
|
--- a/heartbeat/WAS6
|
|
+++ b/heartbeat/WAS6
|
|
@@ -196,7 +196,7 @@ WASPortInfo() {
|
|
esac
|
|
PortCount=`expr $PortCount + 1`
|
|
done
|
|
- netstat -ltnp 2>/dev/null| egrep -i "($pat) .*LISTEN" | sed 's%.*LISTEN *%%'
|
|
+ netstat -ltnp 2>/dev/null| $EGREP -i "($pat) .*LISTEN" | sed 's%.*LISTEN *%%'
|
|
}
|
|
|
|
#
|
|
diff --git a/heartbeat/docker b/heartbeat/docker
|
|
index 50523db934..d51c468977 100755
|
|
--- a/heartbeat/docker
|
|
+++ b/heartbeat/docker
|
|
@@ -512,7 +512,7 @@ image_exists()
|
|
# - image
|
|
# - repository:port/image
|
|
# - docker.io/image (some distro will display "docker.io/" as prefix)
|
|
- docker images | awk '{print $1 ":" $2}' | egrep -q -s "^(docker.io\/|${SERVER_NAME}\/)?${IMAGE_NAME}:${IMAGE_TAG}\$"
|
|
+ docker images | awk '{print $1 ":" $2}' | $EGREP -q -s "^(docker.io\/|${SERVER_NAME}\/)?${IMAGE_NAME}:${IMAGE_TAG}\$"
|
|
if [ $? -eq 0 ]; then
|
|
# image found
|
|
return 0
|
|
diff --git a/heartbeat/eDir88.in b/heartbeat/eDir88.in
|
|
index cd945d2c31..9a21ff852d 100644
|
|
--- a/heartbeat/eDir88.in
|
|
+++ b/heartbeat/eDir88.in
|
|
@@ -331,7 +331,7 @@ eDir_monitor() {
|
|
|
|
# Monitor IDM first, as it will start before LDAP
|
|
if [ $MONITOR_IDM -eq 1 ]; then
|
|
- RET=$($NDSTRACE --config-file "$NDSCONF" -c modules | egrep -i '^vrdim.*Running' | awk '{print $1}')
|
|
+ RET=$($NDSTRACE --config-file "$NDSCONF" -c modules | $EGREP -i '^vrdim.*Running' | awk '{print $1}')
|
|
if [ "$RET" != "vrdim" ]; then
|
|
ocf_log err "eDirectory IDM engine isn't running ($NDSCONF)."
|
|
return $OCF_ERR_GENERIC
|
|
diff --git a/heartbeat/mysql-proxy b/heartbeat/mysql-proxy
|
|
index 013c5e4ec3..2815860d72 100755
|
|
--- a/heartbeat/mysql-proxy
|
|
+++ b/heartbeat/mysql-proxy
|
|
@@ -572,7 +572,7 @@ mysqlproxy_validate_all()
|
|
fi
|
|
|
|
# check for valid log-level
|
|
- echo $log_level | egrep -q "^(error|warning|info|message|debug|)$"
|
|
+ echo $log_level | $EGREP -q "^(error|warning|info|message|debug|)$"
|
|
if [ $? -ne 0 ]; then
|
|
ocf_log err "MySQL Proxy log level '$log_level' not in valid range error|warning|info|message|debug"
|
|
return $OCF_ERR_CONFIGURED
|
|
diff --git a/heartbeat/portblock b/heartbeat/portblock
|
|
index e88ecc2a13..450e372081 100755
|
|
--- a/heartbeat/portblock
|
|
+++ b/heartbeat/portblock
|
|
@@ -529,7 +529,7 @@ IptablesStop()
|
|
CheckPort() {
|
|
# Examples of valid port: "1080", "1", "0080"
|
|
# Examples of invalid port: "1080bad", "0", "0000", ""
|
|
- echo $1 |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
|
|
+ echo $1 | $EGREP -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
|
|
}
|
|
|
|
IptablesValidateAll()
|
|
diff --git a/heartbeat/rabbitmq-server-ha b/heartbeat/rabbitmq-server-ha
|
|
index 8b3cd9ee90..f483380359 100755
|
|
--- a/heartbeat/rabbitmq-server-ha
|
|
+++ b/heartbeat/rabbitmq-server-ha
|
|
@@ -529,7 +529,7 @@ proc_stop()
|
|
pid="none"
|
|
else
|
|
# check if provide just a number
|
|
- echo "${pid_param}" | egrep -q '^[0-9]+$'
|
|
+ echo "${pid_param}" | $EGREP -q '^[0-9]+$'
|
|
if [ $? -eq 0 ]; then
|
|
pid="${pid_param}"
|
|
elif [ -e "${pid_param}" ]; then # check if passed in a pid file
|
|
diff --git a/heartbeat/sapdb.sh b/heartbeat/sapdb.sh
|
|
index 66e9854b6c..dccd36e172 100755
|
|
--- a/heartbeat/sapdb.sh
|
|
+++ b/heartbeat/sapdb.sh
|
|
@@ -238,7 +238,7 @@ sapdatabase_monitor() {
|
|
esac
|
|
|
|
SEARCH=`echo "$OCF_RESKEY_MONITOR_SERVICES" | sed 's/\+/\\\+/g' | sed 's/\./\\\./g'`
|
|
- if [ `echo "$SERVICE" | egrep -c "$SEARCH"` -eq 1 ]
|
|
+ if [ `echo "$SERVICE" | $EGREP -c "$SEARCH"` -eq 1 ]
|
|
then
|
|
if [ $STATE -eq $OCF_NOT_RUNNING ]
|
|
then
|
|
diff --git a/heartbeat/smb-share.in b/heartbeat/smb-share.in
|
|
index 8a1a0a8604..3e5bf60bf1 100755
|
|
--- a/heartbeat/smb-share.in
|
|
+++ b/heartbeat/smb-share.in
|
|
@@ -435,7 +435,7 @@ smb_share_stop() {
|
|
smb_share_monitor() {
|
|
RES=$(smbcontrol smbd ping > /dev/null 2>&1)
|
|
if [ $? -eq 0 ];then
|
|
- if [ $(testparm -s 2>/dev/null| egrep -c \\[$OCF_RESKEY_share\\]) -eq 1 ];then
|
|
+ if [ $(testparm -s 2>/dev/null| $EGREP -c \\[$OCF_RESKEY_share\\]) -eq 1 ];then
|
|
return $OCF_SUCCESS
|
|
else
|
|
return $OCF_NOT_RUNNING
|
|
@@ -449,7 +449,7 @@ smb_share_state() {
|
|
smb_share_checktmpmount
|
|
RES=$(smbcontrol smbd ping > /dev/null 2>&1)
|
|
if [ $? -eq 0 ];then
|
|
- if [ $(testparm -s 2>/dev/null| egrep -c \\[$OCF_RESKEY_share\\]) -eq 1 ];then
|
|
+ if [ $(testparm -s 2>/dev/null| $EGREP -c \\[$OCF_RESKEY_share\\]) -eq 1 ];then
|
|
ocf_log info "Samba share $OCF_RESKEY_share is active"
|
|
return $OCF_SUCCESS
|
|
else
|
|
diff --git a/heartbeat/symlink b/heartbeat/symlink
|
|
index decd9f74e5..82a667a01f 100755
|
|
--- a/heartbeat/symlink
|
|
+++ b/heartbeat/symlink
|
|
@@ -123,7 +123,7 @@ symlink_monitor() {
|
|
ocf_log debug "$OCF_RESKEY_link exists but is not a symbolic link, will be moved to ${OCF_RESKEY_link}${OCF_RESKEY_backup_suffix} on start"
|
|
rc=$OCF_NOT_RUNNING
|
|
fi
|
|
- elif readlink -m "$OCF_RESKEY_link" | egrep -q "^$(readlink -m ${OCF_RESKEY_target})$"; then
|
|
+ elif readlink -m "$OCF_RESKEY_link" | $EGREP -q "^$(readlink -m ${OCF_RESKEY_target})$"; then
|
|
ocf_log debug "$OCF_RESKEY_link exists and is a symbolic link to ${OCF_RESKEY_target}."
|
|
rc=$OCF_SUCCESS
|
|
else
|