From mboxrd@z Thu Jan 1 00:00:00 1970 From: NeilBrown Subject: Re: [PATCH V3 08/11] mdadm: add the ability to change cluster name Date: Mon, 25 May 2015 14:53:10 +1000 Message-ID: <20150525145310.6b6ff7f8@notabene.brown> References: <1432092043-24220-1-git-send-email-gqjiang@suse.com> <1432092043-24220-9-git-send-email-gqjiang@suse.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/0A_WCwwPrOete6EWeKT_PN2"; protocol="application/pgp-signature" Return-path: In-Reply-To: <1432092043-24220-9-git-send-email-gqjiang@suse.com> Sender: linux-raid-owner@vger.kernel.org To: Guoqing Jiang Cc: linux-raid@vger.kernel.org, rgoldwyn@suse.com List-Id: linux-raid.ids --Sig_/0A_WCwwPrOete6EWeKT_PN2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 20 May 2015 11:20:40 +0800 Guoqing Jiang wrote: > To support change the cluster name, the commit do the followings: >=20 > 1. extend original write_bitmap function for new scenario. > 2. add the scenarion to handle the modification of cluster's name > in write_bitmap1. > 3. make update_super1 can change the name in mdp_superblock_1. You haven't documented --update=3Dhome-cluster in mdadm.8.in, or at fprintf(outf, "Valid --update options are:\n" Also, I just realised that you are storing the cluster name in the array name. I don't think that is a clever idea. The cluster name can be 64 chars. The array name can only be 32. I think leave homehost and homecluster completely out of the array name when the array is clustered. and > + new_name =3D xmalloc(sizeof(sb->set_name)); is really unnecessary. Just do "char new_name[32];". But you are probably going to remove that code anyway. NeilBrown >=20 > Signed-off-by: Guoqing Jiang > --- > Assemble.c | 5 +++++ > Grow.c | 2 +- > mdadm.c | 3 +++ > mdadm.h | 7 ++++++- > super0.c | 4 ++-- > super1.c | 43 ++++++++++++++++++++++++++++++++++++++++--- > 6 files changed, 57 insertions(+), 7 deletions(-) >=20 > diff --git a/Assemble.c b/Assemble.c > index 25a103d..e1b846c 100644 > --- a/Assemble.c > +++ b/Assemble.c > @@ -644,6 +644,11 @@ static int load_devices(struct devs *devices, char *= devmap, > *stp =3D st; > return -1; > } > + if (strcmp(c->update, "home-cluster") =3D=3D 0) { > + err =3D tst->ss->update_super(tst, content, c->update, > + devname, 0, 0, c->homecluster); > + tst->ss->write_bitmap(tst, dfd, NameUpdate); > + } > if (strcmp(c->update, "uuid")=3D=3D0 && > !ident->uuid_set) { > ident->uuid_set =3D 1; > diff --git a/Grow.c b/Grow.c > index 1122cec..bf44e66 100644 > --- a/Grow.c > +++ b/Grow.c > @@ -420,7 +420,7 @@ int Grow_addbitmap(char *devname, int fd, struct cont= ext *c, struct shape *s) > bitmapsize, offset_setable, > major) > ) > - st->ss->write_bitmap(st, fd2); > + st->ss->write_bitmap(st, fd2, NoUpdate); > else { > pr_err("failed to create internal bitmap - chunksize problem.\n"); > close(fd2); > diff --git a/mdadm.c b/mdadm.c > index 56fdeb7..22f4fc7 100644 > --- a/mdadm.c > +++ b/mdadm.c > @@ -598,6 +598,7 @@ int main(int argc, char *argv[]) > } > continue; > case O(CREATE, ClusterName): > + case O(ASSEMBLE, ClusterName): > c.homecluster =3D optarg; > if (strlen(c.homecluster) > 64) { > pr_err("Cluster name too big.\n"); > @@ -741,6 +742,8 @@ int main(int argc, char *argv[]) > continue; > if (strcmp(c.update, "homehost")=3D=3D0) > continue; > + if (strcmp(c.update, "home-cluster")=3D=3D0) > + continue; > if (strcmp(c.update, "devicesize")=3D=3D0) > continue; > if (strcmp(c.update, "no-bitmap")=3D=3D0) > diff --git a/mdadm.h b/mdadm.h > index 00c726e..d8b0749 100644 > --- a/mdadm.h > +++ b/mdadm.h > @@ -354,6 +354,11 @@ enum prefix_standard { > IEC > }; > =20 > +enum bitmap_update { > + NoUpdate, > + NameUpdate, > +}; > + > /* structures read from config file */ > /* List of mddevice names and identifiers > * Identifiers can be: > @@ -850,7 +855,7 @@ extern struct superswitch { > /* if add_internal_bitmap succeeded for existing array, this > * writes it out. > */ > - int (*write_bitmap)(struct supertype *st, int fd); > + int (*write_bitmap)(struct supertype *st, int fd, enum bitmap_update up= date); > /* Free the superblock and any other allocated data */ > void (*free_super)(struct supertype *st); > =20 > diff --git a/super0.c b/super0.c > index deb5999..6ad9d39 100644 > --- a/super0.c > +++ b/super0.c > @@ -900,7 +900,7 @@ static int write_init_super0(struct supertype *st) > rv =3D store_super0(st, di->fd); > =20 > if (rv =3D=3D 0 && (sb->state & (1< - rv =3D st->ss->write_bitmap(st, di->fd); > + rv =3D st->ss->write_bitmap(st, di->fd, NoUpdate); > =20 > if (rv) > pr_err("failed to write superblock to %s\n", > @@ -1175,7 +1175,7 @@ static void locate_bitmap0(struct supertype *st, in= t fd) > lseek64(fd, offset, 0); > } > =20 > -static int write_bitmap0(struct supertype *st, int fd) > +static int write_bitmap0(struct supertype *st, int fd, enum bitmap_updat= e update) > { > unsigned long long dsize; > unsigned long long offset; > diff --git a/super1.c b/super1.c > index fd728d2..07944d4 100644 > --- a/super1.c > +++ b/super1.c > @@ -1073,7 +1073,23 @@ static int update_super1(struct supertype *st, str= uct mdinfo *info, > info->name[32] =3D 0; > } > =20 > - if (strcmp(update, "force-one")=3D=3D0) { > + if (strcmp(update, "home-cluster") =3D=3D 0 && > + homehost) { > + /* Note that 'home-cluster' is to change the name of cluster, > + * it is another "name" update. > + */ > + char *new_name =3D xmalloc(sizeof(sb->set_name)); > + if (strrchr(sb->set_name, ':')) { > + strcpy(new_name, strchr(sb->set_name, ':')); > + } > + > + memset(sb->set_name, 0, sizeof(sb->set_name)); > + strcpy(sb->set_name, homehost); > + if (new_name) > + strcat(sb->set_name, new_name); > + > + free(new_name); > + } else if (strcmp(update, "force-one")=3D=3D0) { > /* Not enough devices for a working array, > * so bring this one up-to-date > */ > @@ -1691,7 +1707,7 @@ static int write_init_super1(struct supertype *st) > sb->sb_csum =3D calc_sb_1_csum(sb); > rv =3D store_super1(st, di->fd); > if (rv =3D=3D 0 && (__le32_to_cpu(sb->feature_map) & 1)) > - rv =3D st->ss->write_bitmap(st, di->fd); > + rv =3D st->ss->write_bitmap(st, di->fd, NoUpdate); > close(di->fd); > di->fd =3D -1; > if (rv) > @@ -2175,7 +2191,7 @@ static void locate_bitmap1(struct supertype *st, in= t fd) > lseek64(fd, offset<<9, 0); > } > =20 > -static int write_bitmap1(struct supertype *st, int fd) > +static int write_bitmap1(struct supertype *st, int fd, enum bitmap_updat= e update) > { > struct mdp_superblock_1 *sb =3D st->sb; > bitmap_super_t *bms =3D (bitmap_super_t*)(((char*)sb)+MAX_SB_SIZE); > @@ -2184,6 +2200,27 @@ static int write_bitmap1(struct supertype *st, int= fd) > int towrite, n; > struct align_fd afd; > unsigned int i =3D 0; > + char *new_name; > + > + switch (update) { > + case NameUpdate: > + new_name =3D xmalloc(sizeof(sb->set_name)); > + > + strncpy(new_name, sb->set_name, sizeof(sb->set_name)); > + memset((char *)bms->cluster_name, 0, sizeof(bms->cluster_name)); > + > + if (strtok(new_name, ":")) > + strncpy((char *)bms->cluster_name, new_name, strlen(sb->set_name)); > + else > + /* In case the original set_name doesn't like aaa:md* */ > + strncpy((char *)bms->cluster_name, sb->set_name, strlen(sb->set_name)); > + > + free(new_name); > + break; > + case NoUpdate: > + default: > + break; > + } > =20 > init_afd(&afd, fd); > =20 --Sig_/0A_WCwwPrOete6EWeKT_PN2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIVAwUBVWKqtjnsnt1WYoG5AQINNhAAsY/HJfw20/PKCLyZB21ZP6Q40GvJXpZa aA7cez5Q7B9Z9RhmUiT3Cl5gnAVHdNQlWFmg8b/Fc2jpqhw/dePwSDTDaqaYaU/h lJdU6GvJ4MBojb44vroRe2Z6+V5viwCnNQ0XUchB6w38/8tgi13mPjPZvurcJ9J3 S3zaXsa4vDtTH2dzGWLYv4wLT4I844HLHd57cepOKvA4Sr1GSaPOnirecXJ0KMwd AgpvUG46Ea318wnk9nkpr3L8J+PG3StcPhB+Mp/f9AtyeHAPBEQrYD0j23DLwcdR Dgy1SSR8sGrl27gcn8Po6bRVCXWWdUJfv0Ie+jBkdisH6psVaAFeFDwKaufDrjui 5AvxNXkvJxy8NacQm+jacjW4oTXXIgxRUlXw2g71Q/QzLhQ2n32rmTxDVhPuapVN cbpjNYFjTpkbhKJekuYaavfFp4cRWLjynOr6NVlNmPY2qFAwIaMj0OoXrbTP5tV1 hbcWYZxEt1k0M4CBAEsJJxuMGIaTTdDBG4kbAVIe6Evm5K4lKGIxG0NfbAuYRaK5 0IAGYPIP/3CAXDsh50AmSp/+RU/DLRGVt3iEvdXk+6qP1RodK0TenH9HBInGmzlO 5b4AMFcTsVu5X/uHvq6Nra0TuE3vNOw2VyDdQVDNmpaOgoCEw3wBzJA02yQWPbfl A9LerxwrwiQ= =uOeX -----END PGP SIGNATURE----- --Sig_/0A_WCwwPrOete6EWeKT_PN2--