Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package powerman for openSUSE:Factory
checked in at 2024-09-25 21:53:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/powerman (Old)
and /work/SRC/openSUSE:Factory/.powerman.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerman"
Wed Sep 25 21:53:08 2024 rev:34 rq:1202974 version:2.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/powerman/powerman.changes 2024-07-26
16:16:17.251607305 +0200
+++ /work/SRC/openSUSE:Factory/.powerman.new.29891/powerman.changes
2024-09-25 21:53:20.756418219 +0200
@@ -1,0 +2,8 @@
+Sun Sep 15 12:51:05 UTC 2024 - Antonio Teixeira <antonio.teixe...@suse.com>
+
+- Update to version 2.4.4:
+ * powerman: fix segfault if unspecified host reports status
+ * redfishpower: do not report errors on dependent hosts
+ * Update hostlist library to fix potential array out of bounds error.
+
+-------------------------------------------------------------------
Old:
----
powerman-2.4.3.tar.gz
New:
----
powerman-2.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerman.spec ++++++
--- /var/tmp/diff_new_pack.PGV9xA/_old 2024-09-25 21:53:22.488490262 +0200
+++ /var/tmp/diff_new_pack.PGV9xA/_new 2024-09-25 21:53:22.488490262 +0200
@@ -31,7 +31,7 @@
%endif
Name: powerman
-Version: 2.4.3
+Version: 2.4.4
Release: 0
Summary: Centralized Power Control for Clusters
License: GPL-2.0-or-later
++++++ powerman-2.4.3.tar.gz -> powerman-2.4.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/NEWS.md new/powerman-2.4.4/NEWS.md
--- old/powerman-2.4.3/NEWS.md 2024-07-12 01:16:16.000000000 +0200
+++ new/powerman-2.4.4/NEWS.md 2024-09-11 20:26:23.000000000 +0200
@@ -1,3 +1,14 @@
+powerman-2.4.4 - 11 Sep 2024
+----------------------------
+
+Fix segfault affecting systems with power control hierarchy.
+
+## Fixes
+
+ * powerman: fix segfault if unspecified host reports status
+ * redfishpower: do not report errors on dependent hosts
+ * Update hostlist library to fix potential array out of bounds error.
+
powerman-2.4.3 - 11 Jul 2024
----------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/configure new/powerman-2.4.4/configure
--- old/powerman-2.4.3/configure 2024-07-12 01:17:43.000000000 +0200
+++ new/powerman-2.4.4/configure 2024-09-11 20:51:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for powerman 2.4.3.
+# Generated by GNU Autoconf 2.71 for powerman 2.4.4.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@
# Identity of this package.
PACKAGE_NAME='powerman'
PACKAGE_TARNAME='powerman'
-PACKAGE_VERSION='2.4.3'
-PACKAGE_STRING='powerman 2.4.3'
+PACKAGE_VERSION='2.4.4'
+PACKAGE_STRING='powerman 2.4.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1416,7 +1416,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures powerman 2.4.3 to adapt to many kinds of systems.
+\`configure' configures powerman 2.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of powerman 2.4.3:";;
+ short | recursive ) echo "Configuration of powerman 2.4.4:";;
esac
cat <<\_ACEOF
@@ -1625,7 +1625,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-powerman configure 2.4.3
+powerman configure 2.4.4
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1981,7 +1981,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by powerman $as_me 2.4.3, which was
+It was created by powerman $as_me 2.4.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -12704,7 +12704,7 @@
# Define the identity of the package.
PACKAGE='powerman'
- VERSION='2.4.3'
+ VERSION='2.4.4'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16436,7 +16436,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by powerman $as_me 2.4.3, which was
+This file was extended by powerman $as_me 2.4.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16504,7 +16504,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-powerman config.status 2.4.3
+powerman config.status 2.4.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/examples/powerman_el72.spec
new/powerman-2.4.4/examples/powerman_el72.spec
--- old/powerman-2.4.3/examples/powerman_el72.spec 2024-07-12
01:17:47.000000000 +0200
+++ new/powerman-2.4.4/examples/powerman_el72.spec 2024-09-11
20:51:22.000000000 +0200
@@ -1,5 +1,5 @@
Name: powerman
-Version: 2.4.3
+Version: 2.4.4
Release: 1%{?dist}
Summary: PowerMan - centralized power control for clusters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/httppower.8
new/powerman-2.4.4/man/httppower.8
--- old/powerman-2.4.3/man/httppower.8 2024-07-12 01:17:47.000000000 +0200
+++ new/powerman-2.4.4/man/httppower.8 2024-09-11 20:51:22.000000000 +0200
@@ -1,4 +1,4 @@
-.TH httppower 8 "1 December 2008" "powerman-2.4.3"
+.TH httppower 8 "1 December 2008" "powerman-2.4.4"
.SH NAME
httppower \- communicate with HTTP based power distribution units
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/libpowerman.3
new/powerman-2.4.4/man/libpowerman.3
--- old/powerman-2.4.3/man/libpowerman.3 2024-07-12 01:17:47.000000000
+0200
+++ new/powerman-2.4.4/man/libpowerman.3 2024-09-11 20:51:22.000000000
+0200
@@ -1,4 +1,4 @@
-.TH libpowerman 3 "2 December 2008" "powerman-2.4.3"
+.TH libpowerman 3 "2 December 2008" "powerman-2.4.4"
.SH NAME
libpowerman \- PowerMan Client API
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/plmpower.8
new/powerman-2.4.4/man/plmpower.8
--- old/powerman-2.4.3/man/plmpower.8 2024-07-12 01:17:47.000000000 +0200
+++ new/powerman-2.4.4/man/plmpower.8 2024-09-11 20:51:22.000000000 +0200
@@ -1,4 +1,4 @@
-.TH plmpower 8 "1 December 2008" "powerman-2.4.3"
+.TH plmpower 8 "1 December 2008" "powerman-2.4.4"
.SH NAME
plmpower \- control Insteon/X10 devices via SmartLabs PLM 2412S
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/powerman.1
new/powerman-2.4.4/man/powerman.1
--- old/powerman-2.4.3/man/powerman.1 2024-07-12 01:17:47.000000000 +0200
+++ new/powerman-2.4.4/man/powerman.1 2024-09-11 20:51:22.000000000 +0200
@@ -1,4 +1,4 @@
-.TH powerman 1 "1 December 2008" "powerman-2.4.3"
+.TH powerman 1 "1 December 2008" "powerman-2.4.4"
.SH NAME
powerman \- power on/off nodes
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/powerman.conf.5
new/powerman-2.4.4/man/powerman.conf.5
--- old/powerman-2.4.3/man/powerman.conf.5 2024-07-12 01:17:47.000000000
+0200
+++ new/powerman-2.4.4/man/powerman.conf.5 2024-09-11 20:51:22.000000000
+0200
@@ -1,4 +1,4 @@
-.TH powerman.conf 5 "13 January 2012" "powerman-2.4.3"
+.TH powerman.conf 5 "13 January 2012" "powerman-2.4.4"
.SH NAME
powerman.conf \- configuration file for PowerMan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/powerman.dev.5
new/powerman-2.4.4/man/powerman.dev.5
--- old/powerman-2.4.3/man/powerman.dev.5 2024-07-12 01:17:47.000000000
+0200
+++ new/powerman-2.4.4/man/powerman.dev.5 2024-09-11 20:51:22.000000000
+0200
@@ -1,4 +1,4 @@
-.TH powerman.dev 5 "13 January 2012" "powerman-2.4.3"
+.TH powerman.dev 5 "13 January 2012" "powerman-2.4.4"
.SH NAME
powerman.dev \- PowerMan device specification files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/man/powermand.8
new/powerman-2.4.4/man/powermand.8
--- old/powerman-2.4.3/man/powermand.8 2024-07-12 01:17:47.000000000 +0200
+++ new/powerman-2.4.4/man/powermand.8 2024-09-11 20:51:22.000000000 +0200
@@ -1,4 +1,4 @@
-.TH powermand 8 "13 January 2012" "powerman-2.4.3"
+.TH powermand 8 "13 January 2012" "powerman-2.4.4"
.SH NAME
powermand \- power control and monitoring daemon
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/src/liblsd/hostlist.c
new/powerman-2.4.4/src/liblsd/hostlist.c
--- old/powerman-2.4.3/src/liblsd/hostlist.c 2024-02-03 15:36:12.000000000
+0100
+++ new/powerman-2.4.4/src/liblsd/hostlist.c 2024-09-11 19:18:33.000000000
+0200
@@ -1,24 +1,24 @@
/*****************************************************************************\
- * $Id: hostlist.c 11882 2012-10-03 17:31:41Z grondo $
+ * $LSDId: commit c08d251f3cc9b1a5b69a268f952d64f990366835 $
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrond...@llnl.gov>
* UCRL-CODE-2002-040.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <http://www.llnl.gov/linux/slurm/>.
- *
+ *
* SLURM is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
- *
+ *
* SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along
* with SLURM; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -87,7 +87,7 @@
return(lsd_nomem_error(__FILE__, __LINE__, mesg)); \
} while (0)
-/*
+/*
* Some constants and tunables:
*/
@@ -317,7 +317,7 @@
#define UNLOCK_HOSTLIST(_hl) \
do { \
mutex_unlock(&(_hl)->mutex); \
- } while (0)
+ } while (0)
#define seterrno_ret(_errno, _rc) \
do { \
@@ -341,7 +341,7 @@
va_start(ap, msg);
len = vsnprintf(buf, 1024, msg, ap);
- if ((len < 0) || (len > 1024))
+ if ((len < 0) || (len > 1024))
buf[1023] = '\0';
lsd_fatal_error(file, line, buf);
@@ -351,8 +351,8 @@
}
-/*
- * Helper function for host list string parsing routines
+/*
+ * Helper function for host list string parsing routines
* Returns a pointer to the next token; additionally advance *str
* to the next separator.
*
@@ -369,7 +369,7 @@
int level = 0;
/* push str past any leading separators */
- while (**str != '\0' && strchr(sep, **str) != NULL)
+ while (**str != '\0' && strchr(sep, **str))
(*str)++;
if (**str == '\0')
@@ -378,13 +378,13 @@
/* assign token ptr */
tok = *str;
- while ( **str != '\0' &&
- (level != 0 || strchr(sep, **str) == NULL) ) {
+ while ( **str != '\0' &&
+ (level != 0 || strchr(sep, **str) == NULL) ) {
if ( **str == '[' ) level++;
else if ( **str == ']' ) level--;
(*str)++;
}
-
+
/* nullify consecutive separators and push str beyond them */
while (**str != '\0' && strchr(sep, **str) != NULL)
*(*str)++ = '\0';
@@ -404,12 +404,12 @@
}
/* test whether two format `width' parameters are "equivalent"
- * The width arguments "wn" and "wm" for integers "n" and "m"
+ * The width arguments "wn" and "wm" for integers "n" and "m"
* are equivalent if:
- *
+ *
* o wn == wm OR
*
- * o applying the same format width (either wn or wm) to both of
+ * o applying the same format width (either wn or wm) to both of
* 'n' and 'm' will not change the zero padding of *either* 'm' nor 'n'.
*
* If this function returns 1 (or true), the appropriate width value
@@ -451,14 +451,14 @@
/* ----[ hostname_t functions ]---- */
-/*
+/*
* return the location of the last char in the hostname prefix
*/
static int host_prefix_end(const char *hostname)
{
int idx = strlen(hostname) - 1;
- while (idx >= 0 && isdigit((char) hostname[idx]))
+ while (idx >= 0 && isdigit((char) hostname[idx]))
idx--;
return idx;
}
@@ -466,7 +466,7 @@
static hostname_t hostname_create_with_suffix (const char *hostname, int idx)
{
hostname_t hn = NULL;
- char *p = '\0';
+ char *p = "\0";
assert(hostname != NULL);
@@ -513,7 +513,7 @@
}
-/*
+/*
* create a hostname_t object from a string hostname
*/
static hostname_t hostname_create(const char *hostname)
@@ -536,7 +536,7 @@
free(hn);
}
-/* return true if the hostname has a valid numeric suffix
+/* return true if the hostname has a valid numeric suffix
*/
static int hostname_suffix_is_valid(hostname_t hn)
{
@@ -554,12 +554,12 @@
/* ----[ hostrange_t functions ]---- */
-/* allocate a new hostrange object
+/* allocate a new hostrange object
*/
static hostrange_t hostrange_new(void)
{
hostrange_t new = (hostrange_t) malloc(sizeof(*new));
- if (!new)
+ if (!new)
out_of_memory("hostrange create");
return new;
}
@@ -689,7 +689,7 @@
/* hostrange_cmp() is used to sort hostrange objects. It will
* sort based on the following (in order):
* o result of strcmp on prefixes
- * o if widths are compatible, then:
+ * o if widths are compatible, then:
* sort based on lowest suffix in range
* else
* sort based on width */
@@ -708,11 +708,11 @@
}
-/* compare the prefixes of two hostrange objects.
+/* compare the prefixes of two hostrange objects.
* returns:
* < 0 if h1 prefix is less than h2 OR h1 == NULL.
*
- * 0 if h1's prefix and h2's prefix match,
+ * 0 if h1's prefix and h2's prefix match,
* UNLESS, either h1 or h2 (NOT both) do not have a valid suffix.
*
* > 0 if h1's prefix is greater than h2's OR h2 == NULL. */
@@ -746,7 +746,7 @@
}
-/* compare two hostrange objects to determine if they are width
+/* compare two hostrange objects to determine if they are width
* compatible, returns:
* 1 if widths can safely be combined
* 0 if widths cannot be safely combined
@@ -784,10 +784,10 @@
hr->lo++; /* effectively set count == 0 */
host = strdup(hr->prefix);
} else if (hostrange_count(hr) > 0) {
- size = strlen(hr->prefix) + hr->width + 16;
+ size = strlen(hr->prefix) + hr->width + 16;
if (!(host = (char *) malloc(size * sizeof(char))))
out_of_memory("hostrange pop");
- snprintf(host, size, "%s%0*lu", hr->prefix,
+ snprintf(host, size, "%s%0*lu", hr->prefix,
hr->width, hr->hi--);
}
@@ -824,7 +824,7 @@
*
* -1 if ranges do not overlap (including incompatible zero padding)
* 0 if ranges join perfectly
- * >0 number of hosts that were duplicated in h1 and h2
+ * >0 number of hosts that were duplicated in h1 and h2
*
* h2 will be coalesced into h1 if rc >= 0
*
@@ -878,7 +878,7 @@
assert(hostrange_cmp(h1, h2) <= 0);
if ((hostrange_prefix_cmp(h1, h2) == 0)
- && (h1->hi > h2->lo)
+ && (h1->hi > h2->lo)
&& (hostrange_width_combine(h1, h2))) {
if (!(new = hostrange_copy(h1)))
@@ -1041,7 +1041,7 @@
if ((len >= 0) && (len < n) && (hr->lo < hr->hi)) {
int len2 = snprintf(buf+len, n-len, "-%0*lu", hr->width, hr->hi);
- if (len2 < 0)
+ if (len2 < 0)
len = -1;
else
len += len2;
@@ -1053,7 +1053,7 @@
/* ----[ hostlist functions ]---- */
-/* Create a new hostlist object.
+/* Create a new hostlist object.
* Returns an empty hostlist, or NULL if memory allocation fails.
*/
static hostlist_t hostlist_new(void)
@@ -1063,7 +1063,7 @@
if (!new)
goto fail1;
- assert(new->magic = HOSTLIST_MAGIC);
+ assert((new->magic = HOSTLIST_MAGIC));
mutex_init(&new->mutex);
new->hr = (hostrange_t *) malloc(HOSTLIST_CHUNK * sizeof(hostrange_t));
@@ -1090,20 +1090,20 @@
/* Resize the internal array used to store the list of hostrange objects.
*
* returns 1 for a successful resize,
- * 0 if call to _realloc fails
+ * 0 if call to _realloc fails
*
- * It is assumed that the caller has the hostlist hl locked
+ * It is assumed that the caller has the hostlist hl locked
*/
static int hostlist_resize(hostlist_t hl, size_t newsize)
{
int i;
size_t oldsize;
assert(hl != NULL);
- assert(hl->magic == HOSTLIST_MAGIC);
+ assert((hl->magic == HOSTLIST_MAGIC));
oldsize = hl->size;
hl->size = newsize;
hl->hr = realloc((void *) hl->hr, hl->size*sizeof(hostrange_t));
- if (!(hl->hr))
+ if (!(hl->hr))
return 0;
for (i = oldsize; i < newsize; i++)
@@ -1164,7 +1164,7 @@
/* Same as hostlist_push_range() above, but prefix, lo, hi, and width
- * are passed as args
+ * are passed as args
*/
static int
hostlist_push_hr(hostlist_t hl, char *prefix, unsigned long lo,
@@ -1186,7 +1186,7 @@
hostlist_iterator_t hli;
assert(hl != NULL);
- assert(hl->magic == HOSTLIST_MAGIC);
+ assert((hl->magic == HOSTLIST_MAGIC));
assert(hr != NULL);
if (n > hl->nranges)
@@ -1225,7 +1225,7 @@
hostrange_t old;
assert(hl != NULL);
- assert(hl->magic == HOSTLIST_MAGIC);
+ assert((hl->magic == HOSTLIST_MAGIC));
assert(n < hl->nranges && n >= 0);
old = hl->hr[n];
@@ -1276,23 +1276,23 @@
high = low = 0;
- /* find end of alpha part
+ /* find end of alpha part
* do this by finding last occurence of range_op in str */
pos = strlen(tok) - 1;
- if (strstr(tok, r_op) != '\0') {
- while (pos >= 0 && (char) tok[pos] != range_op)
+ if (strstr(tok, r_op) != NULL) {
+ while (pos >= 0 && (char) tok[pos] != range_op)
pos--;
}
/* now back up past any digits */
while (pos >= 0 && isdigit((char) tok[--pos])) {;}
- /* Check for valid x-y range (x must be a digit)
+ /* Check for valid x-y range (x must be a digit)
* Reset pos if the range is not valid */
if (!isdigit((char) tok[++pos]))
pos = strlen(tok) - 1;
- /* create prefix string
+ /* create prefix string
* if prefix will be zero length, but prefix already exists
* use the previous prefix and fmt
*/
@@ -1351,7 +1351,7 @@
high = 0; /* special case, ugh. */
}
- /* error if:
+ /* error if:
* 1. we are not at end of string
* 2. upper bound equals lower bound
*/
@@ -1377,7 +1377,7 @@
#else /* !WANT_RECKLESS_HOSTRANGE_EXPANSION */
-hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
+hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
{
return _hostlist_create_bracketed(hostlist, sep, r_op);
}
@@ -1389,7 +1389,7 @@
int width;
};
-/* Grab a single range from str
+/* Grab a single range from str
* returns 1 if str contained a valid number or range,
* 0 if conversion of str to a range failed.
*/
@@ -1397,7 +1397,7 @@
{
char *p, *q;
char *orig = strdup(str);
- if (!orig)
+ if (!orig)
seterrno_ret(ENOMEM, 0);
if ((p = strchr(str, '-'))) {
@@ -1406,15 +1406,15 @@
goto error;
}
range->lo = strtoul(str, &q, 10);
- if (q == str)
+ if (q == str)
goto error;
range->hi = (p && *p) ? strtoul(p, &q, 10) : range->lo;
- if (q == p || *q != '\0')
+ if (q == p || *q != '\0')
goto error;
- if (range->lo > range->hi)
+ if (range->lo > range->hi)
goto error;
if (range->hi - range->lo + 1 > MAX_RANGE ) {
@@ -1436,7 +1436,7 @@
/*
* Convert 'str' containing comma separated digits and ranges into an array
- * of struct _range types (max 'len' elements).
+ * of struct _range types (max 'len' elements).
*
* Return number of ranges created, or -1 on error.
*/
@@ -1450,8 +1450,8 @@
return -1;
if ((p = strchr(str, ',')))
*p++ = '\0';
- if (!_parse_single_range(str, &ranges[count++]))
- return -1;
+ if (!_parse_single_range(str, &ranges[count++]))
+ return -1;
str = p;
}
return count;
@@ -1469,7 +1469,7 @@
}
static void
-_push_range_list_with_suffix(hostlist_t hl, char *pfx, char *sfx,
+_push_range_list_with_suffix(hostlist_t hl, char *pfx, char *sfx,
struct _range *rng, int n)
{
int i;
@@ -1491,10 +1491,10 @@
}
/*
- * Create a hostlist from a string with brackets '[' ']' to aid
+ * Create a hostlist from a string with brackets '[' ']' to aid
* detection of ranges and compressed lists
*/
-static hostlist_t
+static hostlist_t
_hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
{
hostlist_t new = hostlist_new();
@@ -1521,7 +1521,7 @@
if ((q = strchr(p, ']'))) {
*q = '\0';
nr = _parse_range_list(p, ranges, MAX_RANGES);
- if (nr < 0)
+ if (nr < 0)
goto error;
if (*(++q) != '\0')
@@ -1529,17 +1529,20 @@
else
_push_range_list(new, prefix, ranges, nr);
-
- } else
- hostlist_push_host(new, cur_tok);
+ } else /* Error: brackets must be balanced */
+ goto error_unmatched;
- } else
+ } else if (strchr(tok, ']')) /* Error: brackets must be balanced */
+ goto error_unmatched;
+ else /* Ok: No brackets found, single host */
hostlist_push_host(new, cur_tok);
}
free(orig);
return new;
+ error_unmatched:
+ errno = EINVAL;
error:
err = errno;
hostlist_destroy(new);
@@ -1595,7 +1598,7 @@
for (i = 0; i < hl->nranges; i++)
hostrange_destroy(hl->hr[i]);
free(hl->hr);
- assert(hl->magic = 0x1);
+ assert((hl->magic = 0x1));
UNLOCK_HOSTLIST(hl);
mutex_destroy(&hl->mutex);
free(hl);
@@ -1679,7 +1682,7 @@
return host;
}
-/* find all iterators affected by a shift (or deletion) at
+/* find all iterators affected by a shift (or deletion) at
* hl->hr[idx], depth, with the deletion of n ranges */
static void
hostlist_shift_iterators(hostlist_t hl, int idx, int depth, int n)
@@ -1778,7 +1781,7 @@
do {
hostlist_push_range(hltmp, hl->hr[i]);
hostrange_destroy(hl->hr[i]);
- } while ( (++i < hl->nranges)
+ } while ( (++i < hl->nranges)
&& hostrange_within_range(hltmp->hr[0], hl->hr[i]) );
hostlist_shift_iterators(hl, i, 0, hltmp->nranges);
@@ -1836,7 +1839,7 @@
int len = snprintf(buf, MAXHOSTNAMELEN + 15, "%s", hr->prefix);
if (!hr->singlehost)
- snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
+ snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
hr->width, hr->lo + depth);
return strdup(buf);
}
@@ -1937,7 +1940,7 @@
return ret;
}
-/* hostrange compare with void * arguments to allow use with
+/* hostrange compare with void * arguments to allow use with
* libc qsort()
*/
int _cmp(const void *hr1, const void *hr2)
@@ -1971,7 +1974,7 @@
}
-/* search through hostlist for ranges that can be collapsed
+/* search through hostlist for ranges that can be collapsed
* does =not= delete any hosts
*/
static void hostlist_collapse(hostlist_t hl)
@@ -1993,7 +1996,7 @@
UNLOCK_HOSTLIST(hl);
}
-/* search through hostlist (hl) for intersecting ranges
+/* search through hostlist (hl) for intersecting ranges
* split up duplicates and coalesce ranges where possible
*/
static void hostlist_coalesce(hostlist_t hl)
@@ -2145,7 +2148,7 @@
if ((len < 0) || (len > n))
return n; /* truncated, buffer filled */
- if (bracket_needed && len < n && len >= 0)
+ if (bracket_needed && len < n)
buf[len++] = '[';
do {
@@ -2208,14 +2211,14 @@
static hostlist_iterator_t hostlist_iterator_new(void)
{
hostlist_iterator_t i = (hostlist_iterator_t) malloc(sizeof(*i));
- if (!i)
+ if (!i)
return NULL;
i->hl = NULL;
i->hr = NULL;
i->idx = 0;
i->depth = -1;
i->next = i;
- assert(i->magic = HOSTLIST_MAGIC);
+ assert((i->magic = HOSTLIST_MAGIC));
return i;
}
@@ -2266,7 +2269,7 @@
}
}
UNLOCK_HOSTLIST(i->hl);
- assert(i->magic = 0x1);
+ assert((i->magic = 0x1));
free(i);
}
@@ -2278,7 +2281,11 @@
return;
if (++(i->depth) > (i->hr->hi - i->hr->lo)) {
i->depth = 0;
- i->hr = i->hl->hr[++i->idx];
+ if (++i->idx >= i->hl->size) {
+ i->hr = NULL;
+ return;
+ }
+ i->hr = i->hl->hr[i->idx];
}
}
@@ -2327,7 +2334,7 @@
len = strlen (i->hr->prefix) + strlen (suffix) + 1;
if (!(buf = malloc (len)))
out_of_memory("hostlist_next");
-
+
buf[0] = '\0';
strcat (buf, i->hr->prefix);
strcat (buf, suffix);
@@ -2428,9 +2435,9 @@
free(set);
}
-/* inserts a single range object into a hostset
+/* inserts a single range object into a hostset
* Assumes that the set->hl lock is already held
- * Updates hl->nhosts
+ * Updates hl->nhosts
*/
static int hostset_insert_range(hostset_t set, hostrange_t hr)
{
@@ -2450,7 +2457,7 @@
for (i = 0; i < hl->nranges; i++) {
if (hostrange_cmp(hr, hl->hr[i]) <= 0) {
- if ((ndups = hostrange_join(hr, hl->hr[i])) >= 0)
+ if ((ndups = hostrange_join(hr, hl->hr[i])) >= 0)
hostlist_delete_range(hl, i);
else if (ndups < 0)
ndups = 0;
@@ -2476,10 +2483,10 @@
if ((ndups = _attempt_range_join(hl, hl->nranges - 1)) <= 0)
ndups = 0;
}
- }
+ }
- /*
- * Return the number of unique hosts inserted
+ /*
+ * Return the number of unique hosts inserted
*/
return nhosts - ndups;
}
@@ -2493,7 +2500,7 @@
hostlist_uniq(hl);
LOCK_HOSTLIST(set->hl);
- for (i = 0; i < hl->nranges; i++)
+ for (i = 0; i < hl->nranges; i++)
n += hostset_insert_range(set, hl->hr[i]);
UNLOCK_HOSTLIST(set->hl);
hostlist_destroy(hl);
@@ -2591,7 +2598,7 @@
return hostlist_deranged_string(set->hl, n, buf);
}
-#if TEST_MAIN
+#if TEST_MAIN
int hostlist_nranges(hostlist_t hl)
{
@@ -2742,6 +2749,6 @@
#endif /* TEST_MAIN */
-/*
- * vi: tabstop=4 shiftwidth=4 expandtab
+/*
+ * vi: tabstop=4 shiftwidth=4 expandtab
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/src/liblsd/hostlist.h
new/powerman-2.4.4/src/liblsd/hostlist.h
--- old/powerman-2.4.3/src/liblsd/hostlist.h 2024-02-03 15:36:12.000000000
+0100
+++ new/powerman-2.4.4/src/liblsd/hostlist.h 2024-09-11 19:18:33.000000000
+0200
@@ -1,24 +1,24 @@
/*****************************************************************************\
- * $Id: hostlist.h 7428 2008-05-23 16:08:31Z grondo $
+ * $LSDId: commit c08d251f3cc9b1a5b69a268f952d64f990366835 $
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrond...@llnl.gov>
* UCRL-CODE-2002-040.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <http://www.llnl.gov/linux/slurm/>.
- *
+ *
* SLURM is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
- *
+ *
* SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License along
* with SLURM; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -40,7 +40,7 @@
* #define lsd_fatal_error(file,line,mesg) \
* error("%s:%s %s\n",file,line,mesg);
*
- * If WITH_LSD_NOMEM_ERROR_FUNC is defined, the linker will expect to
+ * If WITH_LSD_NOMEM_ERROR_FUNC is defined, the linker will expect to
* find an external lsd_nomem_error(file,line,mesg) function. By default,
* lsd_nomem_error(file,line,mesg) is a macro definition that returns NULL.
* This macro may be redefined to invoke another routine instead.
@@ -49,9 +49,9 @@
*
*/
-/* The hostlist opaque data type
+/* The hostlist opaque data type
*
- * A hostlist is a list of hostnames optimized for a prefixXXXX style
+ * A hostlist is a list of hostnames optimized for a prefixXXXX style
* naming convention, where XXXX is a decimal, numeric suffix.
*/
typedef struct hostlist * hostlist_t;
@@ -59,7 +59,7 @@
/* A hostset is a special case of a hostlist. It:
*
* 1. never contains duplicates
- * 2. is always sorted
+ * 2. is always sorted
* (Note: sort occurs first on alphanumeric prefix -- where prefix
* matches, numeric suffixes will be sorted *by value*)
*/
@@ -67,7 +67,7 @@
/* The hostlist iterator type (may be used with a hostset as well)
* used for non-destructive access to hostlist members.
- *
+ *
*/
typedef struct hostlist_iterator * hostlist_iterator_t;
@@ -76,25 +76,25 @@
/* ----[ hostlist creation and destruction ]---- */
/*
- * hostlist_create():
+ * hostlist_create():
*
- * Create a new hostlist from a string representation.
+ * Create a new hostlist from a string representation.
*
* The string representation (str) may contain one or more hostnames or
- * bracketed hostlists separated by either `,' or whitespace. A bracketed
- * hostlist is denoted by a common prefix followed by a list of numeric
- * ranges contained within brackets: e.g. "tux[0-5,12,20-25]"
+ * bracketed hostlists separated by either `,' or whitespace. A bracketed
+ * hostlist is denoted by a common prefix followed by a list of numeric
+ * ranges contained within brackets: e.g. "tux[0-5,12,20-25]"
*
* Note: if this module is compiled with WANT_RECKLESS_HOSTRANGE_EXPANSION
- * defined, a much more loose interpretation of host ranges is used.
- * Reckless hostrange expansion allows all of the following (in addition to
+ * defined, a much more loose interpretation of host ranges is used.
+ * Reckless hostrange expansion allows all of the following (in addition to
* bracketed hostlists):
*
* o tux0-5,tux12,tux20-25
* o tux0-tux5,tux12,tux20-tux25
* o tux0-5,12,20-25
*
- * If str is NULL, and empty hostlist is created and returned.
+ * If str is NULL, and empty hostlist is created and returned.
*
* If the create fails, hostlist_create() returns NULL.
*
@@ -103,7 +103,7 @@
*/
hostlist_t hostlist_create(const char *hostlist);
-/* hostlist_copy():
+/* hostlist_copy():
*
* Allocate a copy of a hostlist object. Returned hostlist must be freed
* with hostlist_destroy.
@@ -125,7 +125,7 @@
*
* The hosts argument may take the same form as in hostlist_create()
*
- * Returns the number of hostnames inserted into the list,
+ * Returns the number of hostnames inserted into the list,
* or 0 on failure.
*/
int hostlist_push(hostlist_t hl, const char *hosts);
@@ -133,7 +133,7 @@
/* hostlist_push_host():
*
- * Push a single host onto the hostlist hl.
+ * Push a single host onto the hostlist hl.
* This function is more efficient than hostlist_push() for a single
* hostname, since the argument does not need to be checked for ranges.
*
@@ -201,8 +201,8 @@
/* hostlist_find():
*
- * Searches hostlist hl for the first host matching hostname
- * and returns position in list if found.
+ * Searches hostlist hl for the first host matching hostname
+ * and returns position in list if found.
*
* Returns -1 if host is not found.
*
@@ -221,7 +221,7 @@
/* hostlist_delete_host():
*
* Deletes the first host that matches `hostname' from the hostlist hl.
- * Note: "hostname" argument cannot contain a range of hosts
+ * Note: "hostname" argument cannot contain a range of hosts
* (see hostlist_delete() for this functionality.)
*
* Returns 1 if successful, 0 if hostname is not found in list.
@@ -242,7 +242,7 @@
/* hostlist_count():
*
* Return the number of hosts in hostlist hl.
- */
+ */
int hostlist_count(hostlist_t hl);
/* hostlist_is_empty(): return true if hostlist is empty. */
@@ -251,7 +251,7 @@
/* ----[ Other hostlist operations ]---- */
/* hostlist_sort():
- *
+ *
* Sort the hostlist hl.
*
*/
@@ -260,7 +260,7 @@
/* hostlist_uniq():
*
* Sort the hostlist hl and remove duplicate entries.
- *
+ *
*/
void hostlist_uniq(hostlist_t hl);
@@ -274,7 +274,7 @@
* or -1 if truncation occurred.
*
* The result will be NULL terminated.
- *
+ *
* hostlist_ranged_string() will write a bracketed hostlist representation
* where possible.
*/
@@ -334,11 +334,11 @@
/* hostlist_next():
*
- * Returns a pointer to the next hostname on the hostlist
+ * Returns a pointer to the next hostname on the hostlist
* or NULL at the end of the list
*
* The caller is responsible for freeing the returned memory.
- */
+ */
char * hostlist_next(hostlist_iterator_t i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/src/powerman/device.c
new/powerman-2.4.4/src/powerman/device.c
--- old/powerman-2.4.3/src/powerman/device.c 2024-04-11 23:45:47.000000000
+0200
+++ new/powerman-2.4.4/src/powerman/device.c 2024-09-11 19:18:33.000000000
+0200
@@ -88,7 +88,7 @@
*/
#define MAX_LEVELS 2
typedef struct {
- int com; /* one of the PM_* above */
+ int com; /* one of the PM_* script types */
List exec; /* stack of ExecCtxs (outer block is first) */
ActionCB complete_fun; /* callback for action completion */
VerbosePrintf vpf_fun; /* callback for device telemetry */
@@ -1178,7 +1178,7 @@
arg->val = xstrdup(str);
}
- if (result != RT_SUCCESS) {
+ if (arg && result != RT_SUCCESS) {
char strbuf[1024];
snprintf(strbuf, sizeof(strbuf), "%s", arg->val);
/* remove trailing carriage return or newline */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/src/redfishpower/redfishpower.c
new/powerman-2.4.4/src/redfishpower/redfishpower.c
--- old/powerman-2.4.3/src/redfishpower/redfishpower.c 2024-05-02
17:55:10.000000000 +0200
+++ new/powerman-2.4.4/src/redfishpower/redfishpower.c 2024-09-11
19:18:33.000000000 +0200
@@ -1520,6 +1520,39 @@
}
}
+static void output_curl_error(struct CURLMsg *cmsg, struct powermsg *pm)
+{
+ if (cmsg->data.result == CURLE_HTTP_RETURNED_ERROR) {
+ /* N.B. curl returns this error code for all response
+ * codes >= 400. So gotta dig in more.
+ */
+ long code;
+
+ if (curl_easy_getinfo(cmsg->easy_handle,
+ CURLINFO_RESPONSE_CODE,
+ &code) != CURLE_OK)
+ printf("%s: %s\n", pm->plugname, "http error");
+ if (code == 400)
+ printf("%s: %s\n", pm->plugname, "bad request");
+ else if (code == 401)
+ printf("%s: %s\n", pm->plugname, "unauthorized");
+ else if (code == 404)
+ printf("%s: %s\n", pm->plugname, "not found");
+ else
+ printf("%s: %s (%ld)\n",
+ pm->plugname,
+ "http error",
+ code);
+ }
+ else
+ printf("%s: %s\n",
+ pm->plugname,
+ curl_easy_strerror(cmsg->data.result));
+ if (verbose)
+ printf("%s: %s\n", pm->plugname,
+ curl_easy_strerror(cmsg->data.result));
+}
+
static void shell(CURLM *mh)
{
int exitflag = 0;
@@ -1681,36 +1714,8 @@
err_exit(false, "private data not set in easy handle");
if (cmsg->data.result != 0) {
- if (cmsg->data.result == CURLE_HTTP_RETURNED_ERROR) {
- /* N.B. curl returns this error code for all
response
- * codes >= 400. So gotta dig in more.
- */
- long code;
-
- if (curl_easy_getinfo(cmsg->easy_handle,
- CURLINFO_RESPONSE_CODE,
- &code) != CURLE_OK)
- printf("%s: %s\n", pm->plugname, "http error");
- if (code == 400)
- printf("%s: %s\n", pm->plugname, "bad
request");
- else if (code == 401)
- printf("%s: %s\n", pm->plugname,
"unauthorized");
- else if (code == 404)
- printf("%s: %s\n", pm->plugname, "not found");
- else
- printf("%s: %s (%ld)\n",
- pm->plugname,
- "http error",
- code);
- }
- else
- printf("%s: %s\n",
- pm->plugname,
- curl_easy_strerror(cmsg->data.result));
- if (verbose)
- printf("%s: %s\n", pm->plugname,
- curl_easy_strerror(cmsg->data.result));
-
+ if (pm->output_result)
+ output_curl_error (cmsg, pm);
process_waiters(mh,
pm->plugname,
STATUS_ERROR);
@@ -1749,7 +1754,8 @@
pm = zlistx_first(cpy);
while (pm) {
if (hostlist_find(test_fail_power_cmd_hosts, pm->hostname) >=
0) {
- printf("%s: %s\n", pm->plugname, "error");
+ if (pm->output_result)
+ printf("%s: %s\n", pm->plugname, "error");
process_waiters(mh,
pm->plugname,
STATUS_ERROR);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerman-2.4.3/t/t0037-cray-ex.t
new/powerman-2.4.4/t/t0037-cray-ex.t
--- old/powerman-2.4.3/t/t0037-cray-ex.t 2024-04-11 23:45:47.000000000
+0200
+++ new/powerman-2.4.4/t/t0037-cray-ex.t 2024-09-11 19:18:33.000000000
+0200
@@ -295,6 +295,38 @@
wait
'
+#
+# redfishpower hpe cray supercomputing ex chassis test - parent failure
+# see issue #197
+#
+
+test_expect_success 'create powerman.conf for chassis w/ 16 redfish nodes
(crayexfail)' '
+ cat >powerman_cray_ex_fail.conf <<-EOT
+ listen "$testaddr"
+ include "$devicesdir/redfishpower-cray-ex.dev"
+ device "d0" "cray-ex" "$redfishdir/redfishpower -h cmm0,t[0-15]
--test-mode --test-fail-power-cmd-hosts=cmm0 |&"
+ node "cmm0,perif[0-7],blade[0-7],t[0-15]" "d0"
+ EOT
+'
+test_expect_success 'start powerman daemon and wait for it to start
(crayexfail)' '
+ $powermand -Y -c powerman_cray_ex_fail.conf &
+ echo $! >powermand.pid &&
+ $powerman --retry-connect=100 --server-host=$testaddr -d
+'
+test_expect_success 'powerman -q shows all unknown' '
+ $powerman -h $testaddr -q >test_crayexfail_query1.out &&
+ makeoutput "" "" "blade[0-7],cmm0,perif[0-7],t[0-15]"
>test_crayexfail_query1.exp &&
+ test_cmp test_crayexfail_query1.exp test_crayexfail_query1.out
+'
+test_expect_success 'powerman -1 t0 dependency error (parent error)' '
+ test_must_fail $powerman -h $testaddr -1 t0 >test_crayexfail_on1.out
2>test_crayexfail_on1.err &&
+ grep "cannot perform on, dependency error" test_crayexfail_on1.err
+'
+test_expect_success 'stop powerman daemon (crayexfail)' '
+ kill -15 $(cat powermand.pid) &&
+ wait
+'
+
test_done
# vi: set ft=sh
