Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package multipath-tools for openSUSE:Factory
checked in at 2021-03-21 23:19:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old)
and /work/SRC/openSUSE:Factory/.multipath-tools.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multipath-tools"
Sun Mar 21 23:19:19 2021 rev:129 rq:879857 version:0.8.5+29+suse.5dabcd2
Changes:
--------
--- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes
2021-03-16 15:45:28.781140437 +0100
+++
/work/SRC/openSUSE:Factory/.multipath-tools.new.2401/multipath-tools.changes
2021-03-21 23:19:24.112719290 +0100
@@ -1,0 +2,8 @@
+Thu Mar 18 09:48:47 UTC 2021 - [email protected]
+
+- Update to version 0.8.5+29+suse.5dabcd2:
+ * 11-dm-mpath.rules: run "multipath -U" with -v1 (bsc#1182871)
+ * libmultipath: merge update_multipath_table() and update_multipath_status()
+ (bsc#1183666)
+
+-------------------------------------------------------------------
Old:
----
multipath-tools-0.8.5+26+suse.2cbedfd.obscpio
New:
----
multipath-tools-0.8.5+29+suse.5dabcd2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.qyQUVw/_old 2021-03-21 23:19:24.820719533 +0100
+++ /var/tmp/diff_new_pack.qyQUVw/_new 2021-03-21 23:19:24.824719535 +0100
@@ -39,7 +39,7 @@
%define _sysdir usr/lib
Name: multipath-tools
-Version: 0.8.5+26+suse.2cbedfd
+Version: 0.8.5+29+suse.5dabcd2
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0-only
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.qyQUVw/_old 2021-03-21 23:19:24.868719550 +0100
+++ /var/tmp/diff_new_pack.qyQUVw/_new 2021-03-21 23:19:24.868719550 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/multipath-tools.git</param>
- <param
name="changesrevision">2cbedfd7568a1c41ede4b45e230cfdddfbb36232</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">5dabcd21663219ae45e694d9f67410978e1b7c94</param></service></servicedata>
\ No newline at end of file
++++++ multipath-tools-0.8.5+26+suse.2cbedfd.obscpio ->
multipath-tools-0.8.5+29+suse.5dabcd2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/multipath-tools-0.8.5+26+suse.2cbedfd/libmpathpersist/mpath_persist.c
new/multipath-tools-0.8.5+29+suse.5dabcd2/libmpathpersist/mpath_persist.c
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/libmpathpersist/mpath_persist.c
2021-03-12 15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/libmpathpersist/mpath_persist.c
2021-03-18 10:08:34.000000000 +0100
@@ -340,8 +340,7 @@
if (refwwid && strncmp (mpp->alias, refwwid, WWID_SIZE - 1))
continue;
- if (update_multipath_table(mpp, pathvec, DI_CHECKER) != DMP_OK
||
- update_multipath_status(mpp) != DMP_OK) {
+ if (update_multipath_table(mpp, pathvec, DI_CHECKER) != DMP_OK)
{
condlog(1, "error parsing map %s", mpp->wwid);
remove_map(mpp, pathvec, curmp, PURGE_VEC);
i--;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/multipath-tools-0.8.5+26+suse.2cbedfd/libmultipath/structs_vec.c
new/multipath-tools-0.8.5+29+suse.5dabcd2/libmultipath/structs_vec.c
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/libmultipath/structs_vec.c
2021-03-12 15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/libmultipath/structs_vec.c
2021-03-18 10:08:34.000000000 +0100
@@ -423,44 +423,27 @@
r = dm_get_map(mpp->alias, &mpp->size, params);
if (r != DMP_OK) {
- condlog(3, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting
table" : "map not present");
+ condlog(2, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting
table" : "map not present");
return r;
}
if (disassemble_map(pathvec, params, mpp)) {
- condlog(3, "%s: cannot disassemble map", mpp->alias);
+ condlog(2, "%s: cannot disassemble map", mpp->alias);
return DMP_ERR;
}
+ *params = '\0';
+ if (dm_get_status(mpp->alias, params) != DMP_OK)
+ condlog(2, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting
status" : "map not present");
+ else if (disassemble_status(params, mpp))
+ condlog(2, "%s: cannot disassemble status", mpp->alias);
+
/* FIXME: we should deal with the return value here */
update_pathvec_from_dm(pathvec, mpp, flags);
return DMP_OK;
}
-int
-update_multipath_status (struct multipath *mpp)
-{
- int r = DMP_ERR;
- char status[PARAMS_SIZE] = {0};
-
- if (!mpp)
- return r;
-
- r = dm_get_status(mpp->alias, status);
- if (r != DMP_OK) {
- condlog(3, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting
status" : "map not present");
- return r;
- }
-
- if (disassemble_status(status, mpp)) {
- condlog(3, "%s: cannot disassemble status", mpp->alias);
- return DMP_ERR;
- }
-
- return DMP_OK;
-}
-
static struct path *find_devt_in_pathgroups(const struct multipath *mpp,
const char *dev_t)
{
@@ -538,11 +521,8 @@
r = update_multipath_table(mpp, pathvec, 0);
if (r != DMP_OK)
return r;
- sync_paths(mpp, pathvec);
- r = update_multipath_status(mpp);
- if (r != DMP_OK)
- return r;
+ sync_paths(mpp, pathvec);
vector_foreach_slot(mpp->pg, pgp, i)
if (pgp->paths)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/multipath-tools-0.8.5+26+suse.2cbedfd/multipath/11-dm-mpath.rules
new/multipath-tools-0.8.5+29+suse.5dabcd2/multipath/11-dm-mpath.rules
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/multipath/11-dm-mpath.rules
2021-03-12 15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/multipath/11-dm-mpath.rules
2021-03-18 10:08:34.000000000 +0100
@@ -32,7 +32,7 @@
# Check the map state directly with multipath -U.
# This doesn't attempt I/O on the device.
-PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -U %k", GOTO="paths_ok"
+PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -U -v1 %k", GOTO="paths_ok"
ENV{MPATH_DEVICE_READY}="0", GOTO="mpath_action"
LABEL="paths_ok"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/multipath-tools-0.8.5+26+suse.2cbedfd/multipath/main.c
new/multipath-tools-0.8.5+29+suse.5dabcd2/multipath/main.c
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/multipath/main.c 2021-03-12
15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/multipath/main.c 2021-03-18
10:08:34.000000000 +0100
@@ -210,8 +210,7 @@
continue;
}
- if (update_multipath_table(mpp, pathvec, flags) != DMP_OK ||
- update_multipath_status(mpp) != DMP_OK) {
+ if (update_multipath_table(mpp, pathvec, flags) != DMP_OK) {
condlog(1, "error parsing map %s", mpp->wwid);
remove_map(mpp, pathvec, curmp, PURGE_VEC);
i--;
@@ -284,8 +283,7 @@
if (mpp == NULL)
goto free;
- if (update_multipath_table(mpp, pathvec, 0) != DMP_OK ||
- update_multipath_status(mpp) != DMP_OK)
+ if (update_multipath_table(mpp, pathvec, 0) != DMP_OK)
goto free;
vector_foreach_slot (mpp->pg, pg, i) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/multipath-tools-0.8.5+26+suse.2cbedfd/multipathd/main.c
new/multipath-tools-0.8.5+29+suse.5dabcd2/multipathd/main.c
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/multipathd/main.c 2021-03-12
15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/multipathd/main.c 2021-03-18
10:08:34.000000000 +0100
@@ -557,8 +557,6 @@
if (update_multipath_table(mpp, vecs->pathvec, 0) != DMP_OK)
goto out;
- if (update_multipath_status(mpp) != DMP_OK)
- goto out;
if (!vector_alloc_slot(vecs->mpvec))
goto out;
@@ -1405,8 +1403,7 @@
return 1;
vector_foreach_slot (vecs->mpvec, mpp, i)
- if (update_multipath_table(mpp, vecs->pathvec, 0) != DMP_OK ||
- update_multipath_status(mpp) != DMP_OK) {
+ if (update_multipath_table(mpp, vecs->pathvec, 0) != DMP_OK) {
remove_map(mpp, vecs->pathvec, vecs->mpvec, PURGE_VEC);
i--;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multipath-tools-0.8.5+26+suse.2cbedfd/tests/devt.c
new/multipath-tools-0.8.5+29+suse.5dabcd2/tests/devt.c
--- old/multipath-tools-0.8.5+26+suse.2cbedfd/tests/devt.c 2021-03-12
15:45:10.000000000 +0100
+++ new/multipath-tools-0.8.5+29+suse.5dabcd2/tests/devt.c 2021-03-18
10:08:34.000000000 +0100
@@ -13,7 +13,9 @@
#include <sys/sysmacros.h>
#include <fcntl.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
+#include <dirent.h>
#include "util.h"
#include "debug.h"
@@ -21,12 +23,22 @@
static bool sys_dev_block_exists(void)
{
- int fd;
- bool rc;
+ DIR *dir;
+ bool rc = false;
- fd = open("/sys/dev/block", O_RDONLY|O_DIRECTORY);
- rc = (fd != -1);
- close(fd);
+ dir = opendir("/sys/dev/block");
+ if (dir != NULL) {
+ struct dirent *de;
+
+ while((de = readdir(dir)) != NULL) {
+ if (strcmp(de->d_name, ".") &&
+ strcmp(de->d_name, "..")) {
+ rc = true;
+ break;
+ }
+ }
+ }
+ closedir(dir);
return rc;
}
++++++ multipath-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.qyQUVw/_old 2021-03-21 23:19:25.108719632 +0100
+++ /var/tmp/diff_new_pack.qyQUVw/_new 2021-03-21 23:19:25.108719632 +0100
@@ -1,5 +1,5 @@
name: multipath-tools
-version: 0.8.5+26+suse.2cbedfd
-mtime: 1615560310
-commit: 2cbedfd7568a1c41ede4b45e230cfdddfbb36232
+version: 0.8.5+29+suse.5dabcd2
+mtime: 1616058514
+commit: 5dabcd21663219ae45e694d9f67410978e1b7c94
