Add 'ppl' and 'no-ppl' options for --update=

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index a7cd16386d4bc641f6c6484c7280d0d8ae509fe6..6a6a56bfb8b9311197a96c0f7e5c98ba3bb7301e 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2016 Neil Brown <neilb@suse.com>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -599,18 +599,15 @@ static int load_devices(struct devs *devices, char *devmap,
                        int err;
                        fstat(mdfd, &stb2);
 
-                       if (strcmp(c->update, "uuid")==0 &&
-                           !ident->uuid_set) {
-                               int rfd;
-                               if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
-                                   read(rfd, ident->uuid, 16) != 16) {
-                                       *(__u32*)(ident->uuid) = random();
-                                       *(__u32*)(ident->uuid+1) = random();
-                                       *(__u32*)(ident->uuid+2) = random();
-                                       *(__u32*)(ident->uuid+3) = random();
-                               }
-                               if (rfd >= 0) close(rfd);
+                       if (strcmp(c->update, "uuid") == 0 && !ident->uuid_set)
+                               random_uuid((__u8 *)ident->uuid);
+
+                       if (strcmp(c->update, "ppl") == 0 &&
+                           ident->bitmap_fd >= 0) {
+                               pr_err("PPL is not compatible with bitmap\n");
+                               return -1;
                        }
+
                        dfd = dev_open(devname,
                                       tmpdev->disposition == 'I'
                                       ? O_RDWR : (O_RDWR|O_EXCL));
@@ -643,7 +640,14 @@ static int load_devices(struct devs *devices, char *devmap,
                        } else if (strcmp(c->update, "nodes") == 0) {
                                tst->nodes = c->nodes;
                                err = tst->ss->write_bitmap(tst, dfd, NodeNumUpdate);
-                       } else
+                       } else if (strcmp(c->update, "revert-reshape") == 0 &&
+                                  c->invalid_backup)
+                               err = tst->ss->update_super(tst, content,
+                                                           "revert-reshape-nobackup",
+                                                           devname, c->verbose,
+                                                           ident->uuid_set,
+                                                           c->homehost);
+                       else
                                err = tst->ss->update_super(tst, content, c->update,
                                                            devname, c->verbose,
                                                            ident->uuid_set,
@@ -964,6 +968,9 @@ static int start_array(int mdfd,
                c->readonly = 1;
        }
 
+       if (content->consistency_policy == CONSISTENCY_POLICY_PPL)
+               clean = 1;
+
        rv = set_array_info(mdfd, st, content);
        if (rv && !err_ok) {
                pr_err("failed to set array info for %s: %s\n",
@@ -1873,10 +1880,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
        struct mdinfo *dev, *sra, *dev2;
        int working = 0, preexist = 0;
        int expansion = 0;
-       struct map_ent *map = NULL;
        int old_raid_disks;
        int start_reshape;
-       char *avail = NULL;
+       char *avail;
        int err;
 
        sysfs_init(content, mdfd, NULL);
@@ -1889,8 +1895,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                    content->text_version[0] == '/')
                        content->text_version[0] = '-';
                if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
-                       if (sra)
-                               sysfs_free(sra);
+                       sysfs_free(sra);
                        return 1;
                }
        }
@@ -1943,10 +1948,57 @@ int assemble_container_content(struct supertype *st, int mdfd,
                free(avail);
                return 1;/* Nothing new, don't try to start */
        }
-       map_update(&map, fd2devnm(mdfd),
-                  content->text_version,
+       map_update(NULL, fd2devnm(mdfd), content->text_version,
                   content->uuid, chosen_name);
 
+       if (content->consistency_policy == CONSISTENCY_POLICY_PPL &&
+           st->ss->validate_ppl) {
+               content->array.state |= 1;
+               err = 0;
+
+               for (dev = content->devs; dev; dev = dev->next) {
+                       int dfd;
+                       char *devpath;
+                       int ret;
+
+                       ret = st->ss->validate_ppl(st, content, dev);
+                       if (ret == 0)
+                               continue;
+
+                       if (ret < 0) {
+                               err = 1;
+                               break;
+                       }
+
+                       if (!c->force) {
+                               pr_err("%s contains invalid PPL - consider --force or --update-subarray with --update=no-ppl\n",
+                                       chosen_name);
+                               content->array.state &= ~1;
+                               avail[dev->disk.raid_disk] = 0;
+                               break;
+                       }
+
+                       /* have --force - overwrite the invalid ppl */
+                       devpath = map_dev(dev->disk.major, dev->disk.minor, 0);
+                       dfd = dev_open(devpath, O_RDWR);
+                       if (dfd < 0) {
+                               pr_err("Failed to open %s\n", devpath);
+                               err = 1;
+                               break;
+                       }
+
+                       err = st->ss->write_init_ppl(st, content, dfd);
+                       close(dfd);
+
+                       if (err)
+                               break;
+               }
+
+               if (err) {
+                       free(avail);
+                       return err;
+               }
+       }
 
        if (enough(content->array.level, content->array.raid_disks,
                   content->array.layout, content->array.state & 1, avail) == 0) {