mdadm: don't show cluster name once the bitmap is cleared

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 245e2138300e65718b341a65eac83a5eefe70346..a7cd16386d4bc641f6c6484c7280d0d8ae509fe6 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -250,7 +250,9 @@ static int select_devices(struct mddev_dev *devlist,
                                        pr_err("no recogniseable superblock on %s\n",
                                               devname);
                                tmpdev->used = 2;
-                       } else if (tst->ss->load_super(tst,dfd, NULL)) {
+                       } else if ((tst->ignore_hw_compat = 0),
+                                  tst->ss->load_super(tst, dfd,
+                                                      report_mismatch ? devname : NULL)) {
                                if (report_mismatch)
                                        pr_err("no RAID superblock on %s\n",
                                               devname);
@@ -635,7 +637,13 @@ static int load_devices(struct devs *devices, char *devmap,
 
                        if (strcmp(c->update, "byteorder") == 0)
                                err = 0;
-                       else
+                       else if (strcmp(c->update, "home-cluster") == 0) {
+                               tst->cluster_name = c->homecluster;
+                               err = tst->ss->write_bitmap(tst, dfd, NameUpdate);
+                       } else if (strcmp(c->update, "nodes") == 0) {
+                               tst->nodes = c->nodes;
+                               err = tst->ss->write_bitmap(tst, dfd, NodeNumUpdate);
+                       } else
                                err = tst->ss->update_super(tst, content, c->update,
                                                            devname, c->verbose,
                                                            ident->uuid_set,
@@ -727,7 +735,7 @@ static int load_devices(struct devs *devices, char *devmap,
                        i = devcnt;
                else
                        i = devices[devcnt].i.disk.raid_disk;
-               if (i+1 == 0) {
+               if (i+1 == 0 || i == MD_DISK_ROLE_JOURNAL) {
                        if (nextspare < content->array.raid_disks*2)
                                nextspare = content->array.raid_disks*2;
                        i = nextspare++;
@@ -905,7 +913,6 @@ static int force_array(struct mdinfo *content,
                avail[chosen_drive] = 1;
                okcnt++;
                tst->ss->free_super(tst);
-
                /* If there are any other drives of the same vintage,
                 * add them in as well.  We can't lose and we might gain
                 */
@@ -936,6 +943,7 @@ static int start_array(int mdfd,
                       unsigned int okcnt,
                       unsigned int sparecnt,
                       unsigned int rebuilding_cnt,
+                      unsigned int journalcnt,
                       struct context *c,
                       int clean, char *avail,
                       int start_partial_ok,
@@ -947,6 +955,15 @@ static int start_array(int mdfd,
        int i;
        unsigned int req_cnt;
 
+       if (content->journal_device_required && (content->journal_clean == 0)) {
+               if (!c->force) {
+                       pr_err("Not safe to assemble with missing or stale journal device, consider --force.\n");
+                       return 1;
+               }
+               pr_err("Journal is missing or stale, starting array read only.\n");
+               c->readonly = 1;
+       }
+
        rv = set_array_info(mdfd, st, content);
        if (rv && !err_ok) {
                pr_err("failed to set array info for %s: %s\n",
@@ -1024,7 +1041,8 @@ static int start_array(int mdfd,
        if (content->array.level == LEVEL_CONTAINER) {
                if (c->verbose >= 0) {
                        pr_err("Container %s has been assembled with %d drive%s",
-                              mddev, okcnt+sparecnt, okcnt+sparecnt==1?"":"s");
+                              mddev, okcnt+sparecnt+journalcnt,
+                              okcnt+sparecnt+journalcnt==1?"":"s");
                        if (okcnt < (unsigned)content->array.raid_disks)
                                fprintf(stderr, " (out of %d)",
                                        content->array.raid_disks);
@@ -1110,6 +1128,8 @@ static int start_array(int mdfd,
                                        fprintf(stderr, "%s %d rebuilding", sparecnt?",":" and", rebuilding_cnt);
                                if (sparecnt)
                                        fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
+                               if (content->journal_clean)
+                                       fprintf(stderr, " and %d journal", journalcnt);
                                fprintf(stderr, ".\n");
                        }
                        if (content->reshape_active &&
@@ -1281,7 +1301,8 @@ int Assemble(struct supertype *st, char *mddev,
        int *best = NULL; /* indexed by raid_disk */
        int bestcnt = 0;
        int devcnt;
-       unsigned int okcnt, sparecnt, rebuilding_cnt, replcnt;
+       unsigned int okcnt, sparecnt, rebuilding_cnt, replcnt, journalcnt;
+       int journal_clean = 0;
        int i;
        int was_forced = 0;
        int most_recent = 0;
@@ -1337,7 +1358,7 @@ try_again:
                       mddev ? mddev : "further assembly");
 
        content = &info;
-       if (st)
+       if (st && c->force)
                st->ignore_hw_compat = 1;
        num_devs = select_devices(devlist, ident, &st, &content, c,
                                  inargv, auto_assem);
@@ -1522,6 +1543,7 @@ try_again:
        okcnt = 0;
        replcnt = 0;
        sparecnt=0;
+       journalcnt=0;
        rebuilding_cnt=0;
        for (i=0; i< bestcnt; i++) {
                int j = best[i];
@@ -1532,8 +1554,13 @@ try_again:
                /* note: we ignore error flags in multipath arrays
                 * as they don't make sense
                 */
-               if (content->array.level != LEVEL_MULTIPATH)
-                       if (!(devices[j].i.disk.state & (1<<MD_DISK_ACTIVE))) {
+               if (content->array.level != LEVEL_MULTIPATH) {
+                       if (devices[j].i.disk.state & (1<<MD_DISK_JOURNAL)) {
+                               if (content->journal_device_required)
+                                       journalcnt++;
+                               else    /* unexpected journal, mark as faulty */
+                                       devices[j].i.disk.state |= (1<<MD_DISK_FAULTY);
+                       } else if (!(devices[j].i.disk.state & (1<<MD_DISK_ACTIVE))) {
                                if (!(devices[j].i.disk.state
                                      & (1<<MD_DISK_FAULTY))) {
                                        devices[j].uptodate = 1;
@@ -1541,6 +1568,7 @@ try_again:
                                }
                                continue;
                        }
+               }
                /* If this device thinks that 'most_recent' has failed, then
                 * we must reject this device.
                 */
@@ -1564,6 +1592,8 @@ try_again:
                    devices[most_recent].i.events
                        ) {
                        devices[j].uptodate = 1;
+                       if (devices[j].i.disk.state & (1<<MD_DISK_JOURNAL))
+                               journal_clean = 1;
                        if (i < content->array.raid_disks * 2) {
                                if (devices[j].i.recovery_start == MaxSector ||
                                    (content->reshape_active &&
@@ -1575,7 +1605,7 @@ try_again:
                                                replcnt++;
                                } else
                                        rebuilding_cnt++;
-                       } else
+                       } else if (devices[j].i.disk.raid_disk != MD_DISK_ROLE_JOURNAL)
                                sparecnt++;
                }
        }
@@ -1635,11 +1665,15 @@ try_again:
 #ifndef MDASSEMBLE
        sysfs_init(content, mdfd, NULL);
 #endif
+       /* after reload context, store journal_clean in context */
+       content->journal_clean = journal_clean;
        for (i=0; i<bestcnt; i++) {
                int j = best[i];
                unsigned int desired_state;
 
-               if (i >= content->array.raid_disks * 2)
+               if (devices[j].i.disk.raid_disk == MD_DISK_ROLE_JOURNAL)
+                       desired_state = (1<<MD_DISK_JOURNAL);
+               else if (i >= content->array.raid_disks * 2)
                        desired_state = 0;
                else if (i & 1)
                        desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_REPLACEMENT);
@@ -1786,7 +1820,7 @@ try_again:
        rv = start_array(mdfd, mddev, content,
                         st, ident, best, bestcnt,
                         chosen_drive, devices, okcnt, sparecnt,
-                        rebuilding_cnt,
+                        rebuilding_cnt, journalcnt,
                         c,
                         clean, avail, start_partial_ok,
                         pre_exist != NULL,