From: Czarnowska, Anna
Sent: Monday, July 05, 2010 11:41 AM
To: Neil Brown
Cc: linux-raid@xxxxxxxxxxxxxxx; Czarnowska, Anna; Hawrylewicz Czarnowski, Przemyslaw; Labun, Marcin; Neubauer, Wojciech; Williams, Dan J; Ciechanowski, Ed; dledford@xxxxxxxxxx
Subject: [PATCH 27/33] extension of IncrementalRemove to store location (port) of removed device
From: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@xxxxxxxxx>
If the disk is taken out from its port this port information is lost. Only udev rule can provide us with this information, and then we have to store it somehow. This patch adds writing 'cookie' file in /var/run/mdadm directory in form of file named with value of <path-id>, containing the names of arrays holding this device before it was removed.
FAILED_SLOTS constant has been added to hold the location of cookie files.
Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@xxxxxxxxx>
---
Incremental.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
Makefile | 6 +++-
mdadm.h | 8 +++++++
3 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/Incremental.c b/Incremental.c index 20e3445..adaefb9 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -937,19 +937,22 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
* raid arrays, and if so first fail (if needed) and then remove the device.
*
* @devname - The device we want to remove
+ * @id_path - name as found in /dev/disk/by-path for this device
*
* Note: the device name must be a kernel name like "sda", so
* that we can find it in /proc/mdstat
*/
-int IncrementalRemove(char *devname, char *path, int verbose)
+int IncrementalRemove(char *devname, char *id_path, int verbose)
{
int mdfd;
int rv;
- struct mdstat_ent *ent;
+ struct mdstat_ent *ent, *mds, *mi;
struct mddev_dev_s devlist;
+ char path[PATH_MAX];
+ FILE *id_fd;
- if (!path) {
- fprintf(stderr, Name ": incremental removal without --path <path_id> lacks "
+ if (!id_path) {
+ fprintf(stderr, Name ": incremental removal without --path <id_path> lacks "
"the possibility to re-add new device in this port\n");
return 1;
}
@@ -965,15 +968,65 @@ int IncrementalRemove(char *devname, char *path, int verbose)
"of any array\n", devname);
return 1;
}
+ strncpy(path, FAILED_SLOTS, PATH_MAX);
+ if (mkdir(path, O_CREAT) < 0 && errno != EEXIST) {
+ fprintf(stderr, Name ": can't create file to save path to old disk\n");
+ return 1;
+ }
+ snprintf(path, PATH_MAX, FAILED_SLOTS "/%s", id_path);
+
+ if ((id_fd = fopen(path, "w")) == NULL) {
+ fprintf(stderr, Name ": can't create file to save path to old disk\n");
+ return 1;
+ }
+
mdfd = open_dev(ent->devnum);
if (mdfd < 0) {
fprintf(stderr, Name ": Cannot open array %s!!\n", ent->dev);
return 1;
}
+
memset(&devlist, 0, sizeof(devlist));
devlist.devname = devname;
devlist.disposition = 'f';
- Manage_subdevs(ent->dev, mdfd, &devlist, verbose);
+
+ /* slightly different behavior for native and external */
+ if (!is_external(ent->metadata_version)) {
+ /* just write array device */
+ if (fprintf(id_fd, "%s\n", ent->dev) < 0) {
+ fprintf(stderr, Name ": Failed to write to <id_path> cookie\n");
+ fclose(id_fd);
+ unlink(path);
+ }
+ Manage_subdevs(ent->dev, mdfd, &devlist, verbose);
+ } else {
+ int subfd;
+ /* write device for all array members */
+ mds = mdstat_read(0, 0);
+
+ for (mi = mds; mi; mi = mi->next)
+ if (is_external(mi->metadata_version) &&
+ is_subarray(mi->metadata_version + 9) &&
+ devname2devnum(mi->metadata_version + 10) == ent->devnum) {
+ /* found member, so */
+ /* create file with names of arrays containing old disk */
+ if (fprintf(id_fd, "%s\n", mi->dev) < 0) {
+ fprintf(stderr, Name ": Failed to write to <id_path> cookie\n");
+ fclose(id_fd);
+ unlink(path);
+ }
+ subfd = open_dev(mi->devnum);
+ if (subfd < 0) {
+ fprintf(stderr, Name ": Cannot open array %s!!\n", mi->dev);
+ return 1;
+ }
+ Manage_subdevs(mi->dev, subfd, &devlist, verbose);
+ close(subfd);
+ }
+ fclose(id_fd);
+ free_mdstat(mds);
+ }
+
devlist.disposition = 'r';
rv = Manage_subdevs(ent->dev, mdfd, &devlist, verbose);
close(mdfd);
diff --git a/Makefile b/Makefile
index 354554c..1e999e8 100644
--- a/Makefile
+++ b/Makefile
@@ -71,8 +71,10 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
ALT_RUN = /lib/init/rw/mdadm
ALT_MAPFILE = map
VAR_RUN = /var/run/mdadm
-ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\"
-VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\"
+# place for autoreplace cookies
+FAILED_SLOTS = /var/run/failed-slots
+ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" -DFAILED_SLOTS=\"$(FAILED_SLOTS)\"
+VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" -DFAILED_SLOTS=\"$(FAILED_SLOTS)\"
CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS)
# If you want a static binary, you might uncomment these diff --git a/mdadm.h b/mdadm.h index 79eed16..6eeebd5 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -91,6 +91,14 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); #define ALT_MAPFILE "map"
#endif /* ALT_MAPFILE */
+/* FAILED_SLOTS is where to save files storing recent removal of array
+ * member in order to allow future reuse of disk inserted in the same
+ * slot for array recovery
+ */
+#ifndef FAILED_SLOTS
+#define FAILED_SLOTS "/var/run/failed-slots"
+#endif /* FAILED_SLOTS */
+
#include "md_u.h"
#include "md_p.h"
#include "bitmap.h"
--
1.6.4.2
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
