From: Martin Wilck <mwilck@suse.com>
To: Christophe Varoqui <christophe.varoqui@opensvc.com>,
Benjamin Marzinski <bmarzins@redhat.com>
Cc: Julian Andres Klode <julian.klode@canonical.com>,
dm-devel@redhat.com, Martin Wilck <mwilck@suse.com>
Subject: [PATCH v4 09/20] libmultipath: functions to indicate mapping failure in /dev/shm
Date: Wed, 4 Apr 2018 18:16:16 +0200 [thread overview]
Message-ID: <20180404161627.6244-10-mwilck@suse.com> (raw)
In-Reply-To: <20180404161627.6244-1-mwilck@suse.com>
Create a simple API that indicates failure to create a map for a
certain WWID. This will allow multipathd to indicate to other tools
(in particular, "multipath -u" during udev processing) that
an attempt to create a map for a certain wwid failed.
The indicator is simply the existence of a file under
/dev/shm/multipath/failed_wwids.
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
libmultipath/defaults.h | 1 +
libmultipath/wwids.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++
libmultipath/wwids.h | 11 +++++
3 files changed, 122 insertions(+)
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index 690182c..19ad2bf 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -53,5 +53,6 @@
#define DEFAULT_WWIDS_FILE "/etc/multipath/wwids"
#define DEFAULT_PRKEYS_FILE "/etc/multipath/prkeys"
#define DEFAULT_CONFIG_DIR "/etc/multipath/conf.d"
+#define MULTIPATH_SHM_BASE "/dev/shm/multipath/"
char * set_default (char * str);
diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
index da685be..c9f5743 100644
--- a/libmultipath/wwids.c
+++ b/libmultipath/wwids.c
@@ -5,6 +5,7 @@
#include <limits.h>
#include <stdio.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include "checkers.h"
#include "vector.h"
@@ -337,3 +338,112 @@ remember_wwid(char *wwid)
condlog(4, "wwid %s already in wwids file", wwid);
return ret;
}
+
+static const char shm_dir[] = MULTIPATH_SHM_BASE "failed_wwids";
+static const char shm_lock[] = ".lock";
+static const char shm_header[] = "multipath shm lock file, don't edit";
+static char _shm_lock_path[sizeof(shm_dir)+sizeof(shm_lock)];
+static const char *shm_lock_path = &_shm_lock_path[0];
+
+static void init_shm_paths(void)
+{
+ snprintf(_shm_lock_path, sizeof(_shm_lock_path),
+ "%s/%s", shm_dir, shm_lock);
+}
+
+static pthread_once_t shm_path_once = PTHREAD_ONCE_INIT;
+
+static int multipath_shm_open(bool rw)
+{
+ int fd;
+ int can_write;
+
+ pthread_once(&shm_path_once, init_shm_paths);
+ fd = open_file(shm_lock_path, &can_write, shm_header);
+
+ if (fd >= 0 && rw && !can_write) {
+ close(fd);
+ condlog(1, "failed to open %s for writing", shm_dir);
+ return -1;
+ }
+
+ return fd;
+}
+
+static void multipath_shm_close(void *arg)
+{
+ long fd = (long)arg;
+
+ close(fd);
+ unlink(shm_lock_path);
+}
+
+static int _failed_wwid_op(const char *wwid, bool rw,
+ int(*func)(const char*), const char *msg)
+{
+ char path[PATH_MAX];
+ long lockfd;
+ int r = -1;
+
+ if (snprintf(path, sizeof(path), "%s/%s", shm_dir, wwid)
+ >= sizeof(path)) {
+ condlog(1, "%s: path name overflow", __func__);
+ return -1;
+ }
+
+ lockfd = multipath_shm_open(rw);
+ if (lockfd == -1)
+ return -1;
+
+ pthread_cleanup_push(multipath_shm_close, (void*)lockfd);
+ r = func(path);
+ pthread_cleanup_pop(1);
+
+ if (r == WWID_FAILED_ERROR)
+ condlog(1, "%s: %s: %s", msg, wwid, strerror(errno));
+ else if (r == WWID_FAILED_CHANGED)
+ condlog(3, "%s: %s", msg, wwid);
+ else if (!rw)
+ condlog(4, "%s: %s is %s", msg, wwid,
+ r == WWID_IS_FAILED ? "failed" : "good");
+
+ return r;
+}
+
+static int _is_failed(const char *path)
+{
+ struct stat st;
+
+ if (lstat(path, &st) == 0)
+ return WWID_IS_FAILED;
+ else if (errno == ENOENT)
+ return WWID_IS_NOT_FAILED;
+ else
+ return WWID_FAILED_ERROR;
+}
+
+static int _mark_failed(const char *path)
+{
+ /* Called from _failed_wwid_op: we know that shm_lock_path exists */
+ if (_is_failed(path) == WWID_IS_FAILED)
+ return WWID_FAILED_UNCHANGED;
+ return (link(shm_lock_path, path) == 0 ? WWID_FAILED_CHANGED :
+ WWID_FAILED_ERROR);
+}
+
+static int _unmark_failed(const char *path)
+{
+ if (_is_failed(path) == WWID_IS_NOT_FAILED)
+ return WWID_FAILED_UNCHANGED;
+ return (unlink(path) == 0 ? WWID_FAILED_CHANGED : WWID_FAILED_ERROR);
+}
+
+#define declare_failed_wwid_op(op, rw) \
+int op ## _wwid(const char *wwid) \
+{ \
+ return _failed_wwid_op(wwid, (rw), _ ## op, #op); \
+}
+
+declare_failed_wwid_op(is_failed, false)
+declare_failed_wwid_op(mark_failed, true)
+declare_failed_wwid_op(unmark_failed, true)
diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
index d9a78b3..0c6ee54 100644
--- a/libmultipath/wwids.h
+++ b/libmultipath/wwids.h
@@ -18,4 +18,15 @@ int check_wwids_file(char *wwid, int write_wwid);
int remove_wwid(char *wwid);
int replace_wwids(vector mp);
+enum {
+ WWID_IS_NOT_FAILED = 0,
+ WWID_IS_FAILED,
+ WWID_FAILED_UNCHANGED,
+ WWID_FAILED_CHANGED,
+ WWID_FAILED_ERROR = -1,
+};
+
+int is_failed_wwid(const char *wwid);
+int mark_failed_wwid(const char *wwid);
+int unmark_failed_wwid(const char *wwid);
#endif /* _WWIDS_H */
--
2.16.1
next prev parent reply other threads:[~2018-04-04 16:16 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-04 16:16 [PATCH v4 00/20] multipath path classification Martin Wilck
2018-04-04 16:16 ` [PATCH v4 01/20] Revert "multipath: ignore -i if find_multipaths is set" Martin Wilck
2018-04-04 16:16 ` [PATCH v4 02/20] Revert "multipathd: imply -n " Martin Wilck
2018-04-04 16:16 ` [PATCH v4 03/20] libmultipath: should_multipath: keep existing maps Martin Wilck
2018-04-04 16:16 ` [PATCH v4 04/20] multipath -u -i: respect entries in WWIDs file Martin Wilck
2018-04-04 16:16 ` [PATCH v4 05/20] libmultipath: trigger change uevent on new device creation Martin Wilck
2018-04-04 16:16 ` [PATCH v4 06/20] libmultipath: trigger path uevent only when necessary Martin Wilck
2018-04-04 16:16 ` [PATCH v4 07/20] libmultipath: change find_multipaths option to multi-value Martin Wilck
2018-04-12 18:32 ` Benjamin Marzinski
2018-04-13 18:23 ` Martin Wilck
2018-04-04 16:16 ` [PATCH v4 08/20] libmultipath: use const char* in open_file() Martin Wilck
2018-04-04 16:16 ` Martin Wilck [this message]
2018-04-12 18:33 ` [PATCH v4 09/20] libmultipath: functions to indicate mapping failure in /dev/shm Benjamin Marzinski
2018-04-12 20:07 ` Martin Wilck
2018-04-12 21:27 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 10/20] libmultipath: indicate wwid failure in dm_addmap_create() Martin Wilck
2018-04-12 18:33 ` Benjamin Marzinski
2018-04-12 20:16 ` Martin Wilck
2018-04-12 20:22 ` Martin Wilck
2018-04-12 21:32 ` Benjamin Marzinski
2018-04-12 22:43 ` Martin Wilck
2018-04-04 16:16 ` [PATCH v4 11/20] multipath -u: common code path for result message Martin Wilck
2018-04-12 18:34 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 12/20] multipath -u: change output to environment/key format Martin Wilck
2018-04-12 18:35 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 13/20] multipath -u: treat failed wwids as invalid Martin Wilck
2018-04-12 18:35 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 14/20] multipath -u: add DM_MULTIPATH_DEVICE_PATH=2 for "maybe" Martin Wilck
2018-04-04 16:16 ` [PATCH v4 15/20] libmultipath: implement find_multipaths_timeout Martin Wilck
2018-04-12 18:35 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 16/20] multipath -u : set FIND_MULTIPATHS_WAIT_UNTIL from /dev/shm Martin Wilck
2018-04-12 18:36 ` Benjamin Marzinski
2018-04-12 20:35 ` Martin Wilck
2018-04-12 21:35 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 18/20] multipath -u: quick check if path is multipathed Martin Wilck
2018-04-12 18:46 ` Benjamin Marzinski
2018-04-12 22:19 ` Martin Wilck
2018-04-13 16:12 ` Benjamin Marzinski
2018-04-13 17:59 ` Martin Wilck
2018-04-04 16:16 ` [PATCH v4 19/20] libmultipath: enable find_multipaths "smart" Martin Wilck
2018-04-12 18:47 ` Benjamin Marzinski
2018-04-12 22:27 ` Martin Wilck
2018-04-13 15:59 ` Benjamin Marzinski
2018-04-04 16:16 ` [PATCH v4 20/20] multipath.rules: find_multipaths "smart" logic Martin Wilck
2018-04-12 18:48 ` Benjamin Marzinski
2018-04-13 16:01 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180404161627.6244-10-mwilck@suse.com \
--to=mwilck@suse.com \
--cc=bmarzins@redhat.com \
--cc=christophe.varoqui@opensvc.com \
--cc=dm-devel@redhat.com \
--cc=julian.klode@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox