imsm: add --update=uuid support

When disks have conflicting container memberships (same container ids
but incompatible member arrays) --update=uuid can be used to move
offenders to a new container id by changing 'orig_family_num'.

Note that this only supports random updates of the uuid as the actual
uuid is synthesized.  We also need to communicate the new
'orig_family_num' value to all disks involved in the update.  A new
field 'update_private' is added to struct mdinfo to allow this
information to be transmitted.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/Assemble.c b/Assemble.c
index 4578906ed6d463fd7a81c70ea531210f446d0605..7da090506a224d0f6efdf4288ee8537c2ac10cb1 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -565,6 +565,7 @@ int Assemble(struct supertype *st, char *mddev,
 #endif
        /* Ok, no bad inconsistancy, we can try updating etc */
        bitmap_done = 0;
 #endif
        /* Ok, no bad inconsistancy, we can try updating etc */
        bitmap_done = 0;

+       content->update_private = NULL;

        for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
                char *devname = tmpdev->devname;
                struct stat stb;
        for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
                char *devname = tmpdev->devname;
                struct stat stb;


@@ -717,6 +718,8 @@ int Assemble(struct supertype *st, char *mddev,
                }
                devcnt++;
        }
                }
                devcnt++;
        }

+       free(content->update_private);
+       content->update_private = NULL;

 
        if (devcnt == 0) {
                fprintf(stderr, Name ": no devices found for %s\n",
 
        if (devcnt == 0) {
                fprintf(stderr, Name ": no devices found for %s\n",

diff --git a/mdadm.h b/mdadm.h
index 91ba624bb879880a5ce7f424c3f89297838a0a25..04b87b829d365786d909a483196d5fb5972845bb 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -153,6 +153,11 @@ struct mdinfo {
        int                     cache_size; /* size of raid456 stripe cache*/
        int                     mismatch_cnt;
        char                    text_version[50];
        int                     cache_size; /* size of raid456 stripe cache*/
        int                     mismatch_cnt;
        char                    text_version[50];

+       void                    *update_private; /* for passing metadata-format
+                                                 * specific update data
+                                                 * between successive calls to
+                                                 * update_super()
+                                                 */

 
        int container_member; /* for assembling external-metatdata arrays
                               * This is to be used internally by metadata
 
        int container_member; /* for assembling external-metatdata arrays
                               * This is to be used internally by metadata

diff --git a/super-intel.c b/super-intel.c
index eaf5b0b8e6f979051ce48425a8222636f686eca1..110c4a89d97334b5e6220b67d06b79f0e1679cb5 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -1378,8 +1378,6 @@ static int update_super_imsm(struct supertype *st, struct mdinfo *info,
                             char *update, char *devname, int verbose,
                             int uuid_set, char *homehost)
 {
                             char *update, char *devname, int verbose,
                             int uuid_set, char *homehost)
 {

-       /* FIXME */
-

        /* For 'assemble' and 'force' we need to return non-zero if any
         * change was made.  For others, the return value is ignored.
         * Update options are:
        /* For 'assemble' and 'force' we need to return non-zero if any
         * change was made.  For others, the return value is ignored.
         * Update options are:


@@ -1395,26 +1393,55 @@ static int update_super_imsm(struct supertype *st, struct mdinfo *info,
         *              linear only
         *  resync: mark as dirty so a resync will happen.
         *  name:  update the name - preserving the homehost
         *              linear only
         *  resync: mark as dirty so a resync will happen.
         *  name:  update the name - preserving the homehost

+        *  uuid:  Change the uuid of the array to match watch is given

         *
         * Following are not relevant for this imsm:
         *  sparc2.2 : update from old dodgey metadata
         *  super-minor: change the preferred_minor number
         *  summaries:  update redundant counters.
         *
         * Following are not relevant for this imsm:
         *  sparc2.2 : update from old dodgey metadata
         *  super-minor: change the preferred_minor number
         *  summaries:  update redundant counters.

-        *  uuid:  Change the uuid of the array to match watch is given

         *  homehost:  update the recorded homehost
         *  _reshape_progress: record new reshape_progress position.
         */
         *  homehost:  update the recorded homehost
         *  _reshape_progress: record new reshape_progress position.
         */

-       int rv = 0;
-       //struct intel_super *super = st->sb;
-       //struct imsm_super *mpb = super->mpb;
+       int rv = 1;
+       struct intel_super *super = st->sb;
+       struct imsm_super *mpb;

 
 

-       if (strcmp(update, "grow") == 0) {
-       }
-       if (strcmp(update, "resync") == 0) {
-               /* dev->vol.dirty = 1; */
-       }
+       /* we can only update container info */
+       if (!super || super->current_vol >= 0 || !super->anchor)
+               return 1;
+
+       mpb = super->anchor;
+
+       if (strcmp(update, "uuid") == 0 && uuid_set && !info->update_private)
+               fprintf(stderr,
+                       Name ": '--uuid' not supported for imsm metadata\n");
+       else if (strcmp(update, "uuid") == 0 && uuid_set && info->update_private) {
+               mpb->orig_family_num = *((__u32 *) info->update_private);
+               rv = 0;
+       } else if (strcmp(update, "uuid") == 0) {
+               __u32 *new_family = malloc(sizeof(*new_family));
+
+               /* update orig_family_number with the incoming random
+                * data, report the new effective uuid, and store the
+                * new orig_family_num for future updates.
+                */
+               if (new_family) {
+                       memcpy(&mpb->orig_family_num, info->uuid, sizeof(__u32));
+                       uuid_from_super_imsm(st, info->uuid);
+                       *new_family = mpb->orig_family_num;
+                       info->update_private = new_family;
+                       rv = 0;
+               }
+       } else if (strcmp(update, "assemble") == 0)
+               rv = 0;
+       else
+               fprintf(stderr,
+                       Name ": '--update=%s' not supported for imsm metadata\n",
+                       update);

 
 

-       /* IMSM has no concept of UUID or homehost */
+       /* successful update? recompute checksum */
+       if (rv == 0)
+               mpb->check_sum = __le32_to_cpu(__gen_imsm_checksum(mpb));

 
        return rv;
 }
 
        return rv;
 }