- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out
parameter defaults - powervs-subnet: build for ppc64le Resolves: RHEL-85057, RHEL-85023
This commit is contained in:
Oyvind Albrigtsen
parent
94bea209d4
commit
ea596d1259
@ -0,0 +1,72 @@
|
||||
From f6a5f38405a93ab88e887aa657ee79593d1a4485 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Wed, 26 Mar 2025 09:48:06 +0100
|
||||
Subject: [PATCH 1/2] tomcat: fix CATALINA_PID not set issue
|
||||
|
||||
---
|
||||
heartbeat/tomcat | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/tomcat b/heartbeat/tomcat
|
||||
index fa2715140b..6d47980296 100755
|
||||
--- a/heartbeat/tomcat
|
||||
+++ b/heartbeat/tomcat
|
||||
@@ -695,10 +695,12 @@ CATALINA_BASE="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}"
|
||||
CATALINA_OUT="${OCF_RESKEY_catalina_out}"
|
||||
|
||||
CATALINA_PID=$OCF_RESKEY_catalina_pid
|
||||
-if [ -z "$CATALINA_PID" ] && [ "$__OCF_ACTION" = "start" ]; then
|
||||
- mkdir -p "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
|
||||
- if [ "${RESOURCE_TOMCAT_USER}" != "root" ]; then
|
||||
- chown ${RESOURCE_TOMCAT_USER} "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
|
||||
+if [ -z "$CATALINA_PID" ]; then
|
||||
+ if [ "$__OCF_ACTION" = "start" ]; then
|
||||
+ mkdir -p "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
|
||||
+ if [ "${RESOURCE_TOMCAT_USER}" != "root" ]; then
|
||||
+ chown ${RESOURCE_TOMCAT_USER} "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
|
||||
+ fi
|
||||
fi
|
||||
CATALINA_PID="${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/catalina.pid"
|
||||
fi
|
||||
|
||||
From b0da375699ebfa544e6e4a13eae554af3e7d65c9 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Fri, 28 Mar 2025 10:50:17 +0100
|
||||
Subject: [PATCH 2/2] tomcat: fix catalina_base and catalina_out parameter
|
||||
defaults
|
||||
|
||||
---
|
||||
heartbeat/tomcat | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/tomcat b/heartbeat/tomcat
|
||||
index 6d47980296..1e8f216384 100755
|
||||
--- a/heartbeat/tomcat
|
||||
+++ b/heartbeat/tomcat
|
||||
@@ -650,7 +650,6 @@ OCF_RESKEY_statusurl_default="http://127.0.0.1:8080"
|
||||
OCF_RESKEY_max_stop_time_default=""
|
||||
OCF_RESKEY_java_home_default=""
|
||||
OCF_RESKEY_java_opts_default=""
|
||||
-OCF_RESKEY_catalina_out_default="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}/logs/catalina.out"
|
||||
OCF_RESKEY_catalina_pid_default=""
|
||||
OCF_RESKEY_tomcat_start_script_default="${TOMCAT_START_SCRIPT}"
|
||||
OCF_RESKEY_tomcat_start_opts_default=""
|
||||
@@ -670,7 +669,6 @@ OCF_RESKEY_logging_manager_default=""
|
||||
: ${OCF_RESKEY_max_stop_time=${OCF_RESKEY_max_stop_time_default}}
|
||||
: ${OCF_RESKEY_java_home=${OCF_RESKEY_java_home_default}}
|
||||
: ${OCF_RESKEY_java_opts=${OCF_RESKEY_java_opts_default}}
|
||||
-: ${OCF_RESKEY_catalina_out=${OCF_RESKEY_catalina_out_default}}
|
||||
: ${OCF_RESKEY_catalina_pid=${OCF_RESKEY_catalina_pid_default}}
|
||||
: ${OCF_RESKEY_tomcat_start_script=${OCF_RESKEY_tomcat_start_script_default}}
|
||||
: ${OCF_RESKEY_tomcat_start_opts=${OCF_RESKEY_tomcat_start_opts_default}}
|
||||
@@ -691,7 +689,9 @@ RESOURCE_STATUSURL="${OCF_RESKEY_statusurl}"
|
||||
JAVA_HOME="${OCF_RESKEY_java_home}"
|
||||
JAVA_OPTS="${OCF_RESKEY_java_opts}"
|
||||
CATALINA_HOME="${OCF_RESKEY_catalina_home}"
|
||||
-CATALINA_BASE="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}"
|
||||
+CATALINA_BASE="${OCF_RESKEY_catalina_base:-${OCF_RESKEY_catalina_home}}"
|
||||
+OCF_RESKEY_catalina_out_default="${OCF_RESKEY_catalina_base:-${OCF_RESKEY_catalina_home}}/logs/catalina.out"
|
||||
+: ${OCF_RESKEY_catalina_out=${OCF_RESKEY_catalina_out_default}}
|
||||
CATALINA_OUT="${OCF_RESKEY_catalina_out}"
|
||||
|
||||
CATALINA_PID=$OCF_RESKEY_catalina_pid
|
||||
@ -45,7 +45,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.16.0
|
||||
Release: 9%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 10%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
@ -67,6 +67,7 @@ Patch14: RHEL-73689-1-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.
|
||||
Patch15: RHEL-73689-2-ocf-shellfuncs-add-missing-variable-in-crm_mon_no_validation.patch
|
||||
Patch16: RHEL-79822-1-portblock-fix-version-detection.patch
|
||||
Patch17: RHEL-79822-2-portblock-use-ocf_log-for-logging.patch
|
||||
Patch18: RHEL-85057-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aliyun.patch
|
||||
@ -241,6 +242,7 @@ exit 1
|
||||
%patch -p1 -P 15
|
||||
%patch -p1 -P 16
|
||||
%patch -p1 -P 17
|
||||
%patch -p1 -P 18
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch -p1 -P 500
|
||||
@ -540,8 +542,9 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_libexecdir}/heartbeat
|
||||
%endif
|
||||
|
||||
%ifarch x86_64
|
||||
%ifarch x86_64 ppc64le
|
||||
%files cloud
|
||||
%ifarch x86_64
|
||||
/usr/lib/ocf/resource.d/heartbeat/aliyun-*
|
||||
%{_mandir}/man7/*aliyun-*
|
||||
/usr/lib/ocf/resource.d/heartbeat/aws*
|
||||
@ -550,13 +553,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_mandir}/man7/*azure-*
|
||||
/usr/lib/ocf/resource.d/heartbeat/gcp-*
|
||||
%{_mandir}/man7/*gcp-*
|
||||
/usr/lib/ocf/resource.d/heartbeat/powervs-subnet
|
||||
%{_mandir}/man7/*powervs-subnet*
|
||||
%exclude /usr/lib/ocf/resource.d/heartbeat/azure-events
|
||||
%exclude %{_mandir}/man7/*azure-events.7*
|
||||
%exclude /usr/lib/ocf/resource.d/heartbeat/gcp-vpc-move-ip
|
||||
%exclude %{_mandir}/man7/*gcp-vpc-move-ip*
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
/usr/lib/ocf/resource.d/heartbeat/powervs-*
|
||||
%{_mandir}/man7/*powervs-*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files paf
|
||||
%doc paf_README.md
|
||||
@ -567,6 +573,13 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Tue Apr 1 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-10
|
||||
- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out
|
||||
parameter defaults
|
||||
- powervs-subnet: build for ppc64le
|
||||
|
||||
Resolves: RHEL-85057, RHEL-85023
|
||||
|
||||
* Thu Feb 20 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-9
|
||||
- portblock: fix iptables version detection
|
||||
- Remove unsupported agents
|
||||
|
||||
Loading…
Reference in New Issue
Block a user