Skip to content

Commit

Permalink
Merge pull request #3675 from ClusterLabs/main
Browse files Browse the repository at this point in the history 
Pull main branch into 3.0
  • Loading branch information
@kgaillot
kgaillot authored Oct 2, 2024
2 parents df09249 + 3e6e016 commit cfd45a8
Show file tree
Hide file tree
Showing 415 changed files with 9,293 additions and 5,762 deletions.
6 changes: 3 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@ configure
/daemons/execd/pacemaker_remote.service
/daemons/fenced/fence_legacy
/daemons/fenced/fence_watchdog
/daemons/pacemakerd/pacemaker.combined.upstart
/daemons/pacemakerd/pacemaker.service
/daemons/pacemakerd/pacemaker.upstart
/doc/Doxyfile
/etc/init.d/pacemaker
/etc/logrotate.d/pacemaker
Expand All @@ -153,7 +151,6 @@ configure
/tools/crm_failcount
/tools/crm_master
/tools/crm_mon.service
/tools/crm_mon.upstart
/tools/crm_report
/tools/crm_rule
/tools/crm_standby
Expand Down Expand Up @@ -302,6 +299,8 @@ pacemaker_*.info
/daemons/fenced/fence_legacy
/daemons/fenced/fence_watchdog
/daemons/pacemakerd/pacemaker
/daemons/pacemakerd/pacemaker.combined.upstart
/daemons/pacemakerd/pacemaker.upstart
/depcomp
/doc/*.build
/doc/*/en-US/Ap-*.xml
Expand Down Expand Up @@ -346,6 +345,7 @@ pacemaker_*.info
/py-compile
/scratch
/tools/cluster-init
/tools/crm_mon.upstart
/test-driver
/xml/assets
/xml/crm.dtd
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Also:
| encrypted remote CIB admin | | pam-devel | pam-devel | libpam0g-dev |
| interactive crm_mon | | ncurses-devel | ncurses-devel | ncurses-dev |
| systemd support | | systemd-devel | systemd-devel | libsystemd-dev |
| systemd/upstart resource support | 1.5.12 or later| dbus-devel | dbus-devel | libdbus-1-dev |
| systemd resource support | 1.5.12 or later| dbus-devel | dbus-devel | libdbus-1-dev |
| Linux-HA style fencing agents | | cluster-glue-libs-devel | libglue-devel | cluster-glue-dev |
| documentation | | asciidoc or asciidoctor | asciidoc or asciidoctor | asciidoc or asciidoctor |
| documentation | | help2man | help2man | help2man |
Expand Down
2 changes: 0 additions & 2 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ SUBDIRS = $(CORE) \
maint \
tests

AM_CPPFLAGS = -I$(top_srcdir)/include

doc_DATA = README.markdown \
COPYING

Expand Down
2 changes: 1 addition & 1 deletion agents/ocf/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ validate: all
@cat "$(RNG)" >/dev/null 2>/dev/null || { echo "Must specify valid RNG" && false; }
@[ -x "$(OCF_ROOT)/lib/heartbeat" ] || { echo "Must specify valid OCF_ROOT" && false; }
@for AGENT in $(dist_ocf_SCRIPTS) $(ocf_SCRIPTS); do \
echo -e "\n\n## $$AGENT:"; \
echo -n -e "* $$AGENT "; \
OCF_ROOT="$(OCF_ROOT)" "$(builddir)/$$AGENT" meta-data \
| xmllint --noout --relaxng $(RNG) - || break; \
done
Expand Down
110 changes: 8 additions & 102 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,6 @@ AC_ARG_ENABLE([systemd],
yes_no_try "$enable_systemd" "try"
enable_systemd=$?

AC_ARG_ENABLE([upstart],
[AS_HELP_STRING([--enable-upstart],
[enable support for managing resources via Upstart (deprecated) @<:@try@:>@])]
)
yes_no_try "$enable_upstart" "try"
enable_upstart=$?

dnl --enable-* options: features inherent to Pacemaker

# AM_GNU_GETTEXT calls AM_NLS which defines the nls option, but it defaults
Expand Down Expand Up @@ -372,26 +365,8 @@ AC_ARG_WITH([corosync-conf],
[ PCMK__COROSYNC_CONF="$withval" ]
)

AC_ARG_WITH([nagios],
[AS_HELP_STRING([--with-nagios], [support nagios resources (deprecated)])]
)
yes_no_try "$with_nagios" "try"
with_nagios=$?

dnl --with-* options: directory locations

AC_ARG_WITH([nagios-plugin-dir],
[AS_HELP_STRING([--with-nagios-plugin-dir=DIR],
[directory for nagios plugins (deprecated) @<:@LIBEXECDIR/nagios/plugins@:>@])],
[ NAGIOS_PLUGIN_DIR="$withval" ]
)

AC_ARG_WITH([nagios-metadata-dir],
[AS_HELP_STRING([--with-nagios-metadata-dir=DIR],
[directory for nagios plugins metadata (deprecated) @<:@DATADIR/nagios/plugins-metadata@:>@])],
[ NAGIOS_METADATA_DIR="$withval" ]
)

INITDIR=""
AC_ARG_WITH([initdir],
[AS_HELP_STRING([--with-initdir=DIR], m4_normalize([
Expand Down Expand Up @@ -1104,6 +1079,11 @@ AC_CHECK_HEADERS([sys/signalfd.h])
AC_CHECK_HEADERS([uuid/uuid.h])
AC_CHECK_HEADERS([security/pam_appl.h pam/pam_appl.h])

AS_IF([test x"$ac_cv_lib_pam_pam_start" = x"yes"],
AS_IF([test x"$ac_cv_header_security_pam_appl_h" = x"yes" dnl
|| test x"$ac_cv_header_pam_pam_appl_h" = x"yes"],
[PCMK_FEATURES="$PCMK_FEATURES pam"]))

# Required headers
REQUIRE_HEADER([arpa/inet.h])
REQUIRE_HEADER([ctype.h])
Expand Down Expand Up @@ -1431,9 +1411,9 @@ AC_CHECK_HEADERS([stonith/stonith.h],
AM_CONDITIONAL([BUILD_LHA_SUPPORT], [test x"$ac_cv_header_stonith_stonith_h" = x"yes"])


dnl ===============================================
dnl Detect DBus, systemd, and Upstart support
dnl ===============================================
dnl ===============================
dnl Detect DBus and systemd support
dnl ===============================

HAVE_dbus=0
PC_NAME_DBUS=""
Expand All @@ -1444,7 +1424,6 @@ PKG_CHECK_MODULES([DBUS],[dbus-1 >= 1.5.12],
CPPFLAGS="${CPPFLAGS} ${DBUS_CFLAGS}"
],[])
AC_DEFINE_UNQUOTED(HAVE_DBUS, $HAVE_dbus, Support dbus)
AM_CONDITIONAL(BUILD_DBUS, test $HAVE_dbus = 1)
AC_SUBST(PC_NAME_DBUS)

check_systemdsystemunitdir() {
Expand Down Expand Up @@ -1506,75 +1485,6 @@ AC_DEFINE_UNQUOTED([SUPPORT_SYSTEMD], [$enable_systemd],
AM_CONDITIONAL([BUILD_SYSTEMD], [test $enable_systemd = $REQUIRED])
AC_SUBST(SUPPORT_SYSTEMD)

AS_CASE([$enable_upstart],
[$REQUIRED], [
AS_IF([test $HAVE_dbus = 0],
[AC_MSG_FAILURE([Cannot support Upstart resources without DBus])])
],
[$OPTIONAL], [
AS_IF([test $HAVE_dbus = 0], [enable_upstart=$DISABLED],
[
AC_MSG_CHECKING([for Upstart version (using dbus-send)])
ret=$({ dbus-send --system --print-reply \
--dest=com.ubuntu.Upstart \
/com/ubuntu/Upstart org.freedesktop.DBus.Properties.Get \
string:com.ubuntu.Upstart0_6 string:version 2>/dev/null \
|| echo "version unavailable"; } | tail -n1)
# sanitize output a bit (interested just in value, not type),
# ret is intentionally unenquoted so as to normalize whitespace
ret=$(echo ${ret} | cut -d' ' -f2-)
AC_MSG_RESULT([${ret}])
AS_IF([test x"$ret" != x"unavailable" \
|| initctl --version 2>/dev/null | grep -q upstart],
[enable_upstart=$REQUIRED],
[enable_upstart=$DISABLED]
)
])
],
)
AC_MSG_CHECKING([whether to enable support for managing resources via Upstart])
AS_IF([test $enable_upstart -eq $DISABLED], [AC_MSG_RESULT([no])],
[
AC_MSG_RESULT([yes])
PCMK_FEATURES="$PCMK_FEATURES upstart"
]
)
AC_DEFINE_UNQUOTED([SUPPORT_UPSTART], [$enable_upstart],
[Support Upstart resources])
AM_CONDITIONAL([BUILD_UPSTART], [test $enable_upstart -eq $REQUIRED])
AC_SUBST(SUPPORT_UPSTART)


dnl ========================================================================
dnl Detect Nagios support
dnl ========================================================================

AS_CASE([$with_nagios],
[$REQUIRED], [
AS_IF([test x"$ac_cv_have_decl_CLOCK_MONOTONIC" = x"no"],
[AC_MSG_FAILURE([Cannot support nagios resources without monotonic clock])])
],
[$OPTIONAL], [
AS_IF([test x"$ac_cv_have_decl_CLOCK_MONOTONIC" = x"no"],
[with_nagios=$DISABLED], [with_nagios=$REQUIRED])
]
)
AS_IF([test $with_nagios -eq $REQUIRED], [PCMK_FEATURES="$PCMK_FEATURES nagios"])
AC_DEFINE_UNQUOTED([SUPPORT_NAGIOS], [$with_nagios], [Support nagios plugins])
AM_CONDITIONAL([BUILD_NAGIOS], [test $with_nagios -eq $REQUIRED])

AS_IF([test x"$NAGIOS_PLUGIN_DIR" = x""],
[NAGIOS_PLUGIN_DIR="${libexecdir}/nagios/plugins"])

AC_DEFINE_UNQUOTED(NAGIOS_PLUGIN_DIR, "$NAGIOS_PLUGIN_DIR", Directory for nagios plugins)
AC_SUBST(NAGIOS_PLUGIN_DIR)

AS_IF([test x"$NAGIOS_METADATA_DIR" = x""],
[NAGIOS_METADATA_DIR="${datadir}/nagios/plugins-metadata"])

AC_DEFINE_UNQUOTED(NAGIOS_METADATA_DIR, "$NAGIOS_METADATA_DIR", Directory for nagios plugins metadata)
AC_SUBST(NAGIOS_METADATA_DIR)

STACKS=""
CLUSTERLIBS=""
PC_NAME_CLUSTER=""
Expand All @@ -1586,7 +1496,6 @@ dnl ========================================================================
PCMK__ENABLE_SERVICE=$DISABLED
AM_COND_IF([BUILD_LSB], [PCMK__ENABLE_SERVICE=$REQUIRED])
AM_COND_IF([BUILD_SYSTEMD], [PCMK__ENABLE_SERVICE=$REQUIRED])
AM_COND_IF([BUILD_UPSTART], [PCMK__ENABLE_SERVICE=$REQUIRED])
AS_IF([test $PCMK__ENABLE_SERVICE -ne $DISABLED],
[PCMK_FEATURES="$PCMK_FEATURES service"])
AC_SUBST(PCMK__ENABLE_SERVICE)
Expand Down Expand Up @@ -2085,9 +1994,7 @@ AC_CONFIG_FILES(Makefile \
daemons/execd/pacemaker_remote.service \
daemons/fenced/Makefile \
daemons/pacemakerd/Makefile \
daemons/pacemakerd/pacemaker.combined.upstart \
daemons/pacemakerd/pacemaker.service \
daemons/pacemakerd/pacemaker.upstart \
daemons/schedulerd/Makefile \
devel/Makefile \
doc/Doxyfile \
Expand Down Expand Up @@ -2176,7 +2083,6 @@ AC_CONFIG_FILES(Makefile \
tests/Makefile \
tools/Makefile \
tools/crm_mon.service \
tools/crm_mon.upstart \
tools/report.collector \
tools/report.common \
xml/Makefile \
Expand Down
12 changes: 0 additions & 12 deletions cts/cli/regression.rules.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,13 @@ crm_rule: --check requires use of --rule=
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
crm_rule: Couldn't parse input string: invalidxml
=#=#=#= End test: crm_rule given invalid input XML - Invalid data given (65) =#=#=#=
* Passed: crm_rule - crm_rule given invalid input XML
=#=#=#= Begin test: crm_rule given invalid input XML (XML) =#=#=#=
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
<pacemaker-result api-version="X" request="crm_rule -c -r blahblah -X invalidxml --output-as=xml">
<status code="65" message="Invalid data given">
<errors>
Expand All @@ -56,19 +50,13 @@ pcmk__log_xmllib_err error: XML Error: ^
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
crm_rule: Couldn't parse input from STDIN
=#=#=#= End test: crm_rule given invalid input XML on stdin - Invalid data given (65) =#=#=#=
* Passed: crm_rule - crm_rule given invalid input XML on stdin
=#=#=#= Begin test: crm_rule given invalid input XML on stdin (XML) =#=#=#=
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
pcmk__log_xmllib_err error: XML Error: Entity: line 1: parser error : Start tag expected, '<' not found
pcmk__log_xmllib_err error: XML Error: invalidxml
pcmk__log_xmllib_err error: XML Error: ^
<pacemaker-result api-version="X" request="crm_rule -c -r blahblah -X - --output-as=xml">
<status code="65" message="Invalid data given">
<errors>
Expand Down
Loading

0 comments on commit cfd45a8

Please sign in to comment.