This patch introduces 0->10 and 10->0 takeover operations for external
metadata. It defines all necessary functions, interfaces and structures.
Signed-off-by: Krzysztof Wojcik <krzysztof.wojcik@xxxxxxxxx>
---
Grow.c | 77 +++++++++++++++++++++++++++++++++++++++-------
super-intel.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 160 insertions(+), 13 deletions(-)
diff --git a/Grow.c b/Grow.c
index 81373ef..833b0bc 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1012,7 +1012,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
*
*/
struct mdu_array_info_s array, orig;
- char *c;
+ char *c = NULL;
int rv = 0;
struct supertype *st;
char *subarray = NULL;
@@ -1305,17 +1305,69 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
rv = 1;/* not possible */
goto release;
}
- err = sysfs_set_str(sra, NULL, "level", c);
- if (err) {
- err = errno;
- fprintf(stderr, Name ": %s: could not set level to %s\n",
- devname, c);
- if (err == EBUSY &&
- (array.state & (1<<MD_SB_BITMAP_PRESENT)))
- fprintf(stderr, " Bitmap must be removed before level can be changed\n");
+ if (level > 0) {
+ err = sysfs_set_str(sra, NULL, "level", c);
+ if (err) {
+ err = errno;
+ fprintf(stderr,
+ Name ": %s: could not set "\
+ "level to %s\n",
+ devname, c);
+ if (err == EBUSY &&
+ (array.state &
+ (1<<MD_SB_BITMAP_PRESENT)))
+ fprintf(stderr,
+ " Bitmap must be"\
+ "removed before level "\
+ "can be changed\n");
+ rv = 1;
+ goto release;
+ }
+ }
+
+ if (st && reshape_super(st,
+ -1,
+ level,
+ UnSet,
+ 0,
+ 0,
+ NULL,
+ devname,
+ !quiet)) {
rv = 1;
goto release;
}
+ /* before sending update make sure that
+ * for external metadata and after changing raid level
+ * mdmon is running
+ */
+ if (st->ss->external &&
+ !mdmon_running(st->container_dev) &&
+ level > 0) {
+ start_mdmon(st->container_dev);
+ if (container)
+ ping_monitor(container);
+ }
+ sync_metadata(st);
+ if (level == 0) {
+ err = sysfs_set_str(sra, NULL, "level", c);
+ if (err) {
+ err = errno;
+ fprintf(stderr, Name ": %s: could not "\
+ "set level to %s\n",
+ devname, c);
+ if (err == EBUSY &&
+ (array.state &
+ (1<<MD_SB_BITMAP_PRESENT)))
+ fprintf(stderr,
+ " Bitmap must "\
+ "be removed before "\
+ "level can be "\
+ "changed\n");
+ rv = 1;
+ }
+ goto release;
+ }
orig = array;
orig_level = orig.level;
ioctl(fd, GET_ARRAY_INFO, &array);
@@ -1327,6 +1379,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
fprintf(stderr, Name " level of %s changed to %s\n",
devname, c);
changed = 1;
+
}
}
@@ -1381,8 +1434,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
/* Looks like this level change doesn't need
* a reshape after all.
*/
- c = map_num(pers, level);
- if (c) {
+ if ((c) && (level == 0)) {
rv = sysfs_set_str(sra, NULL, "level", c);
if (rv) {
int err = errno;
@@ -1401,7 +1453,8 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
if (st->ss->external && !mdmon_running(st->container_dev) &&
level > 0) {
start_mdmon(st->container_dev);
- ping_monitor(container);
+ if (container)
+ ping_monitor(container);
}
goto release;
}
diff --git a/super-intel.c b/super-intel.c
index 9f0bb2c..589d40c 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -289,6 +289,7 @@ enum imsm_update_type {
update_reshape,
update_reshape_set_slots,
update_reshape_cancel,
+ update_level,
};
struct imsm_update_activate_spare {
@@ -365,6 +366,31 @@ struct imsm_update_add_disk {
enum imsm_update_type type;
};
+struct imsm_disk_changes {
+ int major;
+ int minor;
+ int index;
+};
+
+struct imsm_update_level {
+ enum imsm_update_type type;
+ struct dl *disk_list;
+ int delta_disks;
+ int container_member;
+ int disk_qan;
+ int changes_offset;
+ int rm_qan;
+ int add_qan;
+ struct imsm_dev dev;
+ /* here goes the table with disk changes
+ */
+ /* and here goes imsm_disk_changes pointed by changes_offset
+ * disk_changes are put here
+ * as row data every sizeof(struct imsm_disk_changes)
+ *
+ */
+};
+
static struct supertype *match_metadata_desc_imsm(char *arg)
{
struct supertype *st;
@@ -5598,6 +5624,9 @@ update_reshape_exit:
super->updates_pending++;
break;
}
+ case update_level: {
+ break;
+ }
case update_activate_spare: {
struct imsm_update_activate_spare *u = (void *) update->buf;
struct imsm_dev *dev = get_imsm_dev(super, u->array);
@@ -5982,6 +6011,9 @@ static void imsm_prepare_update(struct supertype *st,
u->update_prepared = -1;
break;
}
+ case update_level: {
+ break;
+ }
case update_create_array: {
struct imsm_update_create_array *u = (void *) update->buf;
struct intel_dev *dv;
@@ -6157,6 +6189,13 @@ int imsm_find_array_minor_by_subdev(int subdev, int container, int *minor)
return -1;
}
+static int update_level_imsm(struct supertype *st, struct mdinfo *info,
+ struct geo_params *geo, int verbose,
+ int uuid_set, char *homehost)
+{
+ return 0;
+}
+
int imsm_reshape_is_allowed_on_container(struct supertype *st,
struct geo_params *geo)
{
@@ -6895,6 +6934,7 @@ int imsm_reshape_super(struct supertype *st, long long size, int level,
{
int ret_val = 1;
struct mdinfo *sra = NULL;
+ struct mdinfo *srac = NULL;
int fd = -1;
int fdc = -1;
char buf[PATH_MAX];
@@ -6957,6 +6997,7 @@ int imsm_reshape_super(struct supertype *st, long long size, int level,
"on container\n");
if (ret_val)
unfreeze_container(st);
+
goto imsm_reshape_super_exit;
} else
dprintf("imsm: not a container operation\n");
@@ -6966,6 +7007,12 @@ int imsm_reshape_super(struct supertype *st, long long size, int level,
dprintf("imsm: cannot open container: %s\n", buf);
goto imsm_reshape_super_exit;
}
+ srac = sysfs_read(fdc, 0, GET_VERSION | GET_LEVEL | GET_LAYOUT |
+ GET_DISKS | GET_DEVS | GET_CHUNK | GET_SIZE);
+ if (srac == NULL) {
+ fprintf(stderr, Name ": Cannot read sysfs info (imsm)\n");
+ goto imsm_reshape_super_exit;
+ }
fd = open_dev(st->devnum);
if (fd < 0) {
@@ -6982,7 +7029,53 @@ int imsm_reshape_super(struct supertype *st, long long size, int level,
geo.dev_id = -1;
- /* continue volume check - proceed if delta_disk is zero only
+ /* we have volume so takeover can be performed for single volume only
+ */
+ if ((geo.size == -1) &&
+ (geo.layout == UnSet) &&
+ (geo.raid_disks == 0) &&
+ (geo.level != UnSet)) {
+ /* ok - this is takeover */
+ struct intel_super *super;
+
+ /* takeover raid0<->raid5 doesn't need meta update
+ * this can be handled by migrations if necessary
+ */
+ if ((geo.level == 5) && (sra->array.level == 5)) {
+ ret_val = 0;
+ goto imsm_reshape_super_exit;
+ }
+ st->ss->load_super(st, fdc, NULL);
+ super = st->sb;
+ if (!super) {
+ fprintf(stderr, Name ": Super pointer is NULL.\n");
+ goto imsm_reshape_super_exit;
+ }
+ if (super->anchor->num_raid_devs > 1) {
+ fprintf(stderr, Name ": Cannot perform raid10 takeover "
+ "on multiarray container for imsm.\n");
+ goto imsm_reshape_super_exit;
+ }
+ super->current_vol = 0;
+ st->ss->getinfo_super(st, sra, NULL);
+ if (imsm_find_array_minor_by_subdev(super->current_vol,
+ st->container_dev,
+ &geo.dev_id) < 0)
+ goto imsm_reshape_super_exit;
+
+ /* send metadata update for
+ * raid10 -> raid0 or raid0 -> raid10 takeover */
+ if (((geo.level == 0) && (sra->array.level == 10)) ||
+ ((geo.level == 10) && (sra->array.level == 0))) {
+ st->update_tail = &st->updates;
+ if (update_level_imsm(st, sra, &geo, 0, 0, NULL) == 0)
+ ret_val = 0;
+ goto imsm_reshape_super_exit;
+ }
+ }
+
+ /* this is not takeover
+ * continue volume check - proceed if delta_disk is zero only
*/
if (geo.raid_disks > 0 && geo.raid_disks != UnSet)
delta_disks = geo.raid_disks - sra->array.raid_disks;
@@ -7025,6 +7118,7 @@ int imsm_reshape_super(struct supertype *st, long long size, int level,
imsm_reshape_super_exit:
sysfs_free(sra);
+ sysfs_free(srac);
if (fd >= 0)
close(fd);
if (fdc >= 0)
--
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
