f9dfbb37ac
Modify 0136-RHBZ-1304687-wait-for-map-add.patch
* switch to missing_uev_wait_timeout to stop waiting for uev
Refresh 0137-RHBZ-1280524-clear-chkr-msg.patch
Refresh 0150-RHBZ-1253913-fix-startup-msg.patch
Refresh 0154-UPBZ-1291406-disable-reinstate.patch
Refresh 0156-UPBZ-1313324-dont-fail-discovery.patch
Refresh 0161-RHBZ-1311659-no-kpartx.patch
Refresh 0167-RHBZ-1335176-fix-show-cmds.patch
Add 0173-RH-update-man-page.patch
Add 0174-RHBZ-1362396-modprobe.patch
* make starting the multipathd service modprobe dm-multipath in the
sysvinit scripts
Add 0175-RHBZ-1357382-ordering.patch
* force multipathd.service to start after systemd-udev-trigger.service
Add 0176-RHBZ-1363830-fix-rename.patch
* initialized a variable to make dm_rename not fail randomly
Add 0177-libmultipath-correctly-initialize-pp-sg_id.patch
* This and all the following patches add the rbd patch checker
Add 0178-libmultipath-add-rbd-discovery.patch
Add 0179-multipath-tools-add-checker-callout-to-repair-path.patch
Add 0180-multipath-tools-Add-rbd-checker.patch
Add 0181-multipath-tools-Add-rbd-to-the-hwtable.patch
Add 0182-multipath-tools-check-for-initialized-checker-before.patch
Add 0183-multipathd-Don-t-call-repair-on-blacklisted-path.patch
Add 0184-rbd-fix-sync-repair-support.patch
Add 0185-rbd-check-for-nonshared-clients.patch
Add 0186-rbd-check-for-exclusive-lock-enabled.patch
Add 0187-rbd-fixup-log-messages.patch
Add 0188-RHBZ-1368501-dont-exit.patch
* make multipathd not exit if it encounters recoverable errors on startup
Add 0189-RHBZ-1368211-remove-retries.patch
* add "remove_retries" multipath.conf parameter to make multiple attempts
to remove a multipath device if it is busy.
Add 0190-RHBZ-1380602-rbd-lock-on-read.patch
* pass lock_on_read when remapping image
Add 0191-RHBZ-1169168-disable-changed-paths.patch
* add "disabled_changed_wwids" multipath.conf parameter to disable
paths whose wwid changes
Add 0192-RHBZ-1362409-infinibox-config.patch
Add 0194-RHBZ-1351964-kpartx-recurse.patch
* fix recursion on corrupt dos partitions
Add 0195-RHBZ-1359510-no-daemon-msg.patch
* print a messages when multipathd isn't running
Add 0196-RHBZ-1239173-dont-set-flag.patch
* don't set reload flag on reloads when you gain your first
valid path
Add 0197-RHBZ-1394059-max-sectors-kb.patch
* add "max_sectors_kb" multipath.conf parameter to set max_sectors_kb
on a multipath device and all its path devices
Add 0198-RHBZ-1372032-detect-path-checker.patch
* add "detect_checker" multipath.conf parameter to detect ALUA arrays
and set the path checker to TUR
Add 0199-RHBZ-1279355-3pardata-config.patch
Add 0200-RHBZ-1402092-orphan-status.patch
* clear status on orphan paths
Add 0201-RHBZ-1403552-silence-warning.patch
Add 0202-RHBZ-1362120-skip-prio.patch
* don't run prio on failed paths
Add 0203-RHBZ-1363718-add-msgs.patch
Add 0204-RHBZ-1406226-nimble-config.patch
Add 0205-RHBZ-1416569-reset-stats.patch
* add "reset maps stats" and "reset map <map> stats" multipathd
interactive commands to reset the stats tracked by multipathd
Add 0206-RHBZ-1239173-pt2-no-paths.patch
* make multipath correctly disable scanning and rules running when
it gets a uevent and there are not valid paths.
Add 0207-UP-add-libmpathcmd.patch
* New shared library, libmpathcmd, that sends and receives messages from
multipathd. device-mapper-multipath now uses this library internally.
Add 0208-UPBZ-1430097-multipathd-IPC-changes.patch
* validation that modifying commands are coming from root.
Add 0209-UPBZ-1430097-multipath-C-API.patch
* New shared library. libdmmp, that presents the information from multipathd
in a structured manner to make it easier for callers to use
Add 0210-RH-fix-uninstall.patch
* Minor compilation fixes
Add 0211-RH-strlen-fix.patch
* checks that variables are not NULL before passing them to strlen
Add 0212-RHBZ-1431562-for-read-only.patch
Make 3 new subpackages
* device-mapper-multipath-devel, libdmmp, and libdmmp-devel. libmpathcmd
and libmpathprio are in device-mapper-multipath-libs and
device-mapper-multipath-devel. libdmmp is in its own subpackages
Move libmpathprio devel files to device-mapper-multipath-devel
Added BuildRequires on librados2-devel
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 513d210cdbccfdaadb0cf7f09ba97d563aac52bb Mon Sep 17 00:00:00 2001
|
|
From: Mike Christie <mchristi@redhat.com>
|
|
Date: Wed, 31 Aug 2016 15:40:16 -0500
|
|
Subject: [PATCH 10/11] rbd: check for exclusive lock enabled
|
|
|
|
Only attach the checker if the rbd image has the exclusive lock
|
|
enabled.
|
|
|
|
Signed-off-by: Mike Christie <mchristi@redhat.com>
|
|
---
|
|
libmultipath/checkers/rbd.c | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/checkers/rbd.c b/libmultipath/checkers/rbd.c
|
|
index a6f3405..e34bf53 100644
|
|
--- a/libmultipath/checkers/rbd.c
|
|
+++ b/libmultipath/checkers/rbd.c
|
|
@@ -33,6 +33,8 @@ typedef int (thread_fn)(struct rbd_checker_context *ct, char *msg);
|
|
|
|
#define RBD_MSG(msg, fmt, args...) snprintf(msg, CHECKER_MSG_LEN, fmt, ##args);
|
|
|
|
+#define RBD_FEATURE_EXCLUSIVE_LOCK (1 << 2)
|
|
+
|
|
struct rbd_checker_context {
|
|
int rbd_bus_id;
|
|
char *client_addr;
|
|
@@ -65,8 +67,9 @@ int libcheck_init(struct checker * c)
|
|
struct udev_device *bus_dev;
|
|
struct udev *udev;
|
|
struct stat sb;
|
|
- const char *block_name, *addr, *config_info;
|
|
+ const char *block_name, *addr, *config_info, *features_str;
|
|
const char *image, *pool, *snap, *username;
|
|
+ uint64_t features = 0;
|
|
char sysfs_path[PATH_SIZE];
|
|
int ret;
|
|
|
|
@@ -119,6 +122,15 @@ int libcheck_init(struct checker * c)
|
|
if (!ct->client_addr)
|
|
goto free_dev;
|
|
|
|
+ features_str = udev_device_get_sysattr_value(bus_dev, "features");
|
|
+ if (!features_str)
|
|
+ goto free_addr;
|
|
+ features = strtoll(features_str, NULL, 16);
|
|
+ if (!(features & RBD_FEATURE_EXCLUSIVE_LOCK)) {
|
|
+ condlog(3, "Exclusive lock not set.");
|
|
+ goto free_addr;
|
|
+ }
|
|
+
|
|
config_info = udev_device_get_sysattr_value(bus_dev, "config_info");
|
|
if (!config_info)
|
|
goto free_addr;
|
|
--
|
|
1.8.3.1
|
|
|