Rename prio callout program mpath_prio_netapp to mpath_prio_ontap

Hi,

Attached are 2 patches to rename the callout program from mpath_prio_netapp to mpath_prio_ontap.
The decision for the name change has mainly been for having a more generic name.

The patches were created against the multipath-tools git repository.

Thanks,
Ritesh

From 0e1c1dd546adc6d356e97c0872debf402220d818 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <[email protected]>
Date: Wed, 3 Oct 2007 16:27:59 +0530
Subject: [PATCH] Rename pp_netapp to pp_ontap for generic naming convention

This patch changes prio callout file mpath_prio_netapp to mpath_prio_ontap and some other minor changes

---
 libmultipath/hwtable.c              |    4 +-
 multipath-tools.spec.in             |    2 +-
 path_priority/pp_netapp/Makefile    |   22 ---
 path_priority/pp_netapp/pp_netapp.c |  268 ----------------------------------
 path_priority/pp_ontap/Makefile     |   22 +++
 path_priority/pp_ontap/pp_ontap.c   |  272 +++++++++++++++++++++++++++++++++++
 6 files changed, 297 insertions(+), 293 deletions(-)
 delete mode 100644 path_priority/pp_netapp/Makefile
 delete mode 100644 path_priority/pp_netapp/pp_netapp.c
 create mode 100644 path_priority/pp_ontap/Makefile
 create mode 100644 path_priority/pp_ontap/pp_ontap.c

index ef761d7..6043c43 100644
@@ -444,7 +444,7 @@ static struct hwentry default_hw[] = {
 		.vendor        = "NETAPP",
 		.product       = "LUN.*",
 		.getuid        = DEFAULT_GETUID,
-		.getprio       = "/sbin/mpath_prio_netapp /dev/%n",
+		.getprio       = "/sbin/mpath_prio_ontap /dev/%n",
 		.features      = "1 queue_if_no_path",
 		.hwhandler     = DEFAULT_HWHANDLER,
 		.selector      = DEFAULT_SELECTOR,

@@ -465,7 +465,7 @@ static struct hwentry default_hw[] = {
 		.vendor        = "IBM",
 		.product       = "Nseries.*",
 		.getuid        = DEFAULT_GETUID,
-		.getprio       = "/sbin/mpath_prio_netapp /dev/%n",
+		.getprio       = "/sbin/mpath_prio_ontap /dev/%n",
 		.features      = "1 queue_if_no_path",
 		.hwhandler     = DEFAULT_HWHANDLER,
 		.selector      = DEFAULT_SELECTOR,

index 3caede6..5e0d1a8 100644
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/sbin/mpath_prio_emc
 %{prefix}/sbin/mpath_prio_random
 %{prefix}/sbin/mpath_prio_balance_units
-%{prefix}/sbin/mpath_prio_netapp
+%{prefix}/sbin/mpath_prio_ontap
 %{prefix}/sbin/mpath_prio_rdac
 %{prefix}/sbin/mpath_prio_hds_modular
 %{prefix}/usr/share/man/man8/devmap_name.8.gz

deleted file mode 100644
index b29d002..0000000
@@ -1,22 +0,0 @@
-EXEC		= mpath_prio_netapp
-BUILD		= glibc
-OBJS		= pp_netapp.o
-
-TOPDIR		= ../..
-include $(TOPDIR)/Makefile.inc
-
-all: $(BUILD)
-
-glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
-
-klibc:	$(OBJS)
-	$(CC) -static -o $(EXEC) $(OBJS)
-
-install: $(EXEC)
-	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
-
-uninstall:
-	rm $(DESTDIR)$(bindir)/$(EXEC)
-clean:	
-	rm -f *.o $(EXEC)

new file mode 100644
index 0000000..8b8f901
@@ -0,0 +1,22 @@
+EXEC		= mpath_prio_ontap
+BUILD		= glibc
+OBJS		= pp_ontap.o
+
+TOPDIR		= ../..
+include $(TOPDIR)/Makefile.inc
+
+all: $(BUILD)
+
+glibc:	$(OBJS)
+	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+
+klibc:	$(OBJS)
+	$(CC) -static -o $(EXEC) $(OBJS)
+
+install: $(EXEC)
+	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+
+uninstall:
+	rm $(DESTDIR)$(bindir)/$(EXEC)
+clean:	
+	rm -f *.o $(EXEC)

1.5.3.2

From c3fef2aad724614bcf6d004827b1e7bae9124a44 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <[email protected]>
Date: Wed, 3 Oct 2007 16:32:09 +0530
Subject: [PATCH] Updated manpage with the new path prio callout name

---
 multipath/multipath.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index c8ab6b0..96e4d27 100644
@@ -130,7 +130,7 @@ Generate the path priority for EMC arrays
 .B mpath_prio_alua /dev/%n
 Generate the path priority based on the SCSI-3 ALUA settings.
 .TP
-.B mpath_prio_netapp /dev/%n
+.B mpath_prio_ontap /dev/%n
 Generate the path priority for NetApp arrays.
 .TP
 .B mpath_prio_rdac /dev/%n

1.5.3.2

We're unable to take such a patch into RHEL directly because it is removing a program that was there before and that breaks backwards compatibility, but how about maintaining a symlink from the old location?

Alasdair

[email protected]

Hi,

We've been shipping the mpath_prio_ontap callout program for more than a year with our software kit (which is supposed to be installed on top of our supported Linux operating systems). So customers who'd have followed our setup guides should not be hit by any compatibility issues.

We're looking forward to using "mpath_prio_ontap" as the name because it is more generic and serves our additional needs.

For RHEL5/4 series, is it okay to have "mpath_prio_netapp" as a link pointing to "mpath_prio_ontap" ?

As for RHEL6 and ahead, we could just remove "mpath_prio_netapp".

Thanks,
Ritesh

Yes - we can add things easily; just not remove existing files or make existing configuration parameters stop working unless there's a compelling reason (like security or if it's the only way to fix a serious design flaw).

Yes.

Alasdair

[email protected]