improve vgmetadatacopies unmanaged message

4 files changed, 18 insertions, 20 deletions

diff --git a/tools/toollib.c b/tools/toollib.c
index 9ffbae2a..bdb52d57 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1187,7 +1187,7 @@ void vgcreate_params_set_defaults(struct vgcreate_params *vp_def,
 		vp_def->max_lv = vg->max_lv;
 		vp_def->alloc = vg->alloc;
 		vp_def->clustered = vg_is_clustered(vg);
-		vp_def->metadata_copies = vg->mda_copies;
+		vp_def->vgmetadatacopies = vg->mda_copies;
 	} else {
 		vp_def->vg_name = NULL;
 		vp_def->extent_size = DEFAULT_EXTENT_SIZE * 2;
@@ -1195,7 +1195,7 @@ void vgcreate_params_set_defaults(struct vgcreate_params *vp_def,
 		vp_def->max_lv = DEFAULT_MAX_LV;
 		vp_def->alloc = DEFAULT_ALLOC_POLICY;
 		vp_def->clustered = DEFAULT_CLUSTERED;
-		vp_def->metadata_copies = DEFAULT_VGMETADATACOPIES;
+		vp_def->vgmetadatacopies = DEFAULT_VGMETADATACOPIES;
 	}
 }
 
@@ -1244,13 +1244,13 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd,
 	}
 
 	if (arg_count(cmd, metadatacopies_ARG)) {
-		vp_new->metadata_copies = arg_int_value(cmd, metadatacopies_ARG,
+		vp_new->vgmetadatacopies = arg_int_value(cmd, metadatacopies_ARG,
 							DEFAULT_VGMETADATACOPIES);
 	} else if (arg_count(cmd, vgmetadatacopies_ARG)) {
-		vp_new->metadata_copies = arg_int_value(cmd, vgmetadatacopies_ARG,
+		vp_new->vgmetadatacopies = arg_int_value(cmd, vgmetadatacopies_ARG,
 							DEFAULT_VGMETADATACOPIES);
 	} else {
-		vp_new->metadata_copies = find_config_tree_int(cmd,
+		vp_new->vgmetadatacopies = find_config_tree_int(cmd,
 						   "metadata/vgmetadatacopies",
 						   DEFAULT_VGMETADATACOPIES);
 	}
@@ -1378,19 +1378,19 @@ int pvcreate_params_validate(struct cmd_context *cmd,
 	}
 
 	if (arg_count(cmd, metadataignore_ARG)) {
-		pp->mda_ignore = !strcmp(arg_str_value(cmd,
+		pp->metadataignore = !strcmp(arg_str_value(cmd,
 						metadataignore_ARG,
 						DEFAULT_PVMETADATAIGNORE_STR),
 					 "y");
 	} else {
-		pp->mda_ignore = !strcmp(find_config_tree_str(cmd,
+		pp->metadataignore = !strcmp(find_config_tree_str(cmd,
 					"metadata/pvmetadataignore",
 					DEFAULT_PVMETADATAIGNORE_STR),
 					"y");
 	}
 	if (arg_count(cmd, pvmetadatacopies_ARG) &&
 	    !arg_int_value(cmd, pvmetadatacopies_ARG, -1) &&
-	    pp->mda_ignore) {
+	    pp->metadataignore) {
 		log_error("metadataignore only applies to metadatacopies > 0");
 		return 0;
 	}
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 1d3e3210..ed5a7ef0 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -528,17 +528,15 @@ static int _vgchange_refresh(struct cmd_context *cmd, struct volume_group *vg)
 static int _vgchange_metadata_copies(struct cmd_context *cmd,
 				     struct volume_group *vg)
 {
-	uint32_t mda_copies = DEFAULT_VGMETADATACOPIES;
-
-	if (arg_count(cmd, vgmetadatacopies_ARG))
-		mda_copies = arg_uint_value(cmd, vgmetadatacopies_ARG,
-			DEFAULT_VGMETADATACOPIES);
-	else if (arg_count(cmd, metadatacopies_ARG))
-		mda_copies = arg_uint_value(cmd, metadatacopies_ARG,
-			DEFAULT_VGMETADATACOPIES);
+	uint32_t mda_copies = arg_uint_value(cmd, vgmetadatacopies_ARG, DEFAULT_VGMETADATACOPIES);
+
 	if (mda_copies == vg_mda_copies(vg)) {
-		log_error("Metadata copies of VG %s is already %u",
-			  vg->name, mda_copies);
+		if (vg_mda_copies(vg) == VGMETADATACOPIES_UNMANAGED)
+			log_error("Number of metadata copies for VG %s is already unmanaged.",
+				  vg->name);
+		else
+			log_error("Number of metadata copies for VG %s is already %" PRIu32,
+				  vg->name, mda_copies);
 		return ECMD_PROCESSED;
 	}
 
diff --git a/tools/vgcreate.c b/tools/vgcreate.c
index 3bb500f5..e6f3a263 100644
--- a/tools/vgcreate.c
+++ b/tools/vgcreate.c
@@ -64,7 +64,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
 	    !vg_set_max_pv(vg, vp_new.max_pv) ||
 	    !vg_set_alloc_policy(vg, vp_new.alloc) ||
 	    !vg_set_clustered(vg, vp_new.clustered) ||
-	    !vg_set_mda_copies(vg, vp_new.metadata_copies))
+	    !vg_set_mda_copies(vg, vp_new.vgmetadatacopies))
 		goto bad_orphan;
 
 	if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
diff --git a/tools/vgsplit.c b/tools/vgsplit.c
index 988c3343..63de1b86 100644
--- a/tools/vgsplit.c
+++ b/tools/vgsplit.c
@@ -384,7 +384,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)
 		    !vg_set_max_pv(vg_to, vp_new.max_pv) ||
 		    !vg_set_alloc_policy(vg_to, vp_new.alloc) ||
 		    !vg_set_clustered(vg_to, vp_new.clustered) ||
-		    !vg_set_mda_copies(vg_to, vp_new.metadata_copies))
+		    !vg_set_mda_copies(vg_to, vp_new.vgmetadatacopies))
 			goto_bad;
 	}