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
109 lines
3.8 KiB
Diff
109 lines
3.8 KiB
Diff
---
|
|
multipathd/cli.c | 2 ++
|
|
multipathd/cli_handlers.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
|
multipathd/cli_handlers.h | 2 ++
|
|
multipathd/main.c | 2 ++
|
|
4 files changed, 50 insertions(+)
|
|
|
|
Index: multipath-tools-130222/multipathd/cli.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/cli.c
|
|
+++ multipath-tools-130222/multipathd/cli.c
|
|
@@ -482,6 +482,8 @@ cli_init (void) {
|
|
add_handler(LIST+BLACKLIST, NULL);
|
|
add_handler(LIST+DEVICES, NULL);
|
|
add_handler(LIST+WILDCARDS, NULL);
|
|
+ add_handler(RESET+MAPS+STATS, NULL);
|
|
+ add_handler(RESET+MAP+STATS, NULL);
|
|
add_handler(ADD+PATH, NULL);
|
|
add_handler(DEL+PATH, NULL);
|
|
add_handler(ADD+MAP, NULL);
|
|
Index: multipath-tools-130222/multipathd/cli_handlers.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/cli_handlers.c
|
|
+++ multipath-tools-130222/multipathd/cli_handlers.c
|
|
@@ -233,6 +233,17 @@ show_config (char ** r, int * len)
|
|
return 0;
|
|
}
|
|
|
|
+void
|
|
+reset_stats(struct multipath * mpp)
|
|
+{
|
|
+ mpp->stat_switchgroup = 0;
|
|
+ mpp->stat_path_failures = 0;
|
|
+ mpp->stat_map_loads = 0;
|
|
+ mpp->stat_total_queueing_time = 0;
|
|
+ mpp->stat_queueing_timeouts = 0;
|
|
+ mpp->stat_map_failures = 0;
|
|
+}
|
|
+
|
|
int
|
|
cli_list_config (void * v, char ** reply, int * len, void * data)
|
|
{
|
|
@@ -501,6 +512,39 @@ cli_list_daemon (void * v, char ** reply
|
|
}
|
|
|
|
int
|
|
+cli_reset_maps_stats (void * v, char ** reply, int * len, void * data)
|
|
+{
|
|
+ struct vectors * vecs = (struct vectors *)data;
|
|
+ int i;
|
|
+ struct multipath * mpp;
|
|
+
|
|
+ condlog(3, "reset multipaths stats (operator)");
|
|
+
|
|
+ vector_foreach_slot(vecs->mpvec, mpp, i) {
|
|
+ reset_stats(mpp);
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+int
|
|
+cli_reset_map_stats (void * v, char ** reply, int * len, void * data)
|
|
+{
|
|
+ struct vectors * vecs = (struct vectors *)data;
|
|
+ struct multipath * mpp;
|
|
+ char * param = get_keyparam(v, MAP);
|
|
+
|
|
+ param = convert_dev(param, 0);
|
|
+ mpp = find_mp_by_str(vecs->mpvec, param);
|
|
+
|
|
+ if (!mpp)
|
|
+ return 1;
|
|
+
|
|
+ condlog(3, "reset multipath %s stats (operator)", param);
|
|
+ reset_stats(mpp);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+int
|
|
cli_add_path (void * v, char ** reply, int * len, void * data)
|
|
{
|
|
struct vectors * vecs = (struct vectors *)data;
|
|
Index: multipath-tools-130222/multipathd/cli_handlers.h
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/cli_handlers.h
|
|
+++ multipath-tools-130222/multipathd/cli_handlers.h
|
|
@@ -16,6 +16,8 @@ int cli_list_config (void * v, char ** r
|
|
int cli_list_blacklist (void * v, char ** reply, int * len, void * data);
|
|
int cli_list_devices (void * v, char ** reply, int * len, void * data);
|
|
int cli_list_wildcards (void * v, char ** reply, int * len, void * data);
|
|
+int cli_reset_maps_stats (void * v, char ** reply, int * len, void * data);
|
|
+int cli_reset_map_stats (void * v, char ** reply, int * len, void * data);
|
|
int cli_add_path (void * v, char ** reply, int * len, void * data);
|
|
int cli_del_path (void * v, char ** reply, int * len, void * data);
|
|
int cli_add_map (void * v, char ** reply, int * len, void * data);
|
|
Index: multipath-tools-130222/multipathd/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/main.c
|
|
+++ multipath-tools-130222/multipathd/main.c
|
|
@@ -1011,6 +1011,8 @@ uxlsnrloop (void * ap)
|
|
set_handler_callback(LIST+BLACKLIST, cli_list_blacklist);
|
|
set_handler_callback(LIST+DEVICES, cli_list_devices);
|
|
set_handler_callback(LIST+WILDCARDS, cli_list_wildcards);
|
|
+ set_handler_callback(RESET+MAPS+STATS, cli_reset_maps_stats);
|
|
+ set_handler_callback(RESET+MAP+STATS, cli_reset_map_stats);
|
|
set_handler_callback(ADD+PATH, cli_add_path);
|
|
set_handler_callback(DEL+PATH, cli_del_path);
|
|
set_handler_callback(ADD+MAP, cli_add_map);
|