lvm2app: Implementation of pv resize (v4)

index ffec129..4af9edf 100644
@@ -482,8 +482,12 @@ struct physical_volume *pv_create(const struct cmd_context *cmd,
 				  unsigned pvmetadatacopies,
 				  uint64_t pvmetadatasize,
 				  unsigned metadataignore);
-int pv_resize(struct physical_volume *pv, struct volume_group *vg,
-	      uint64_t size);
+
+int pv_resize(struct cmd_context *cmd,
+				struct volume_group *vg,
+				struct physical_volume *pv,
+				const uint64_t new_size);
+
 int pv_analyze(struct cmd_context *cmd, const char *pv_name,
 	       uint64_t label_sector);
 

63 lines not on this page · raw message

index 93a78c3..00f92ab 100644
@@ -1624,9 +1624,10 @@ pv_t lvm_pv_from_uuid(vg_t vg, const char *uuid);
 /**
  * Resize physical volume to new_size bytes.
  *
- * \memberof pv_t
+ * Note: Make sure to do a lvm_vg_write on the containing vg to save the
+ * new size.
  *
- * NOTE: This function is currently not implemented.
+ * \memberof pv_t
  *
  * \param   pv
  * Physical volume handle.

index 90edaed..c12adf1 100644
@@ -120,10 +120,23 @@ pv_t lvm_pv_from_uuid(vg_t vg, const char *uuid)
 	return NULL;
 }
 
-
 int lvm_pv_resize(const pv_t pv, uint64_t new_size)
 {
-	/* FIXME: add pv resize code here */
-	log_error("NOT IMPLEMENTED YET");
-	return -1;
+	uint64_t size = new_size >> SECTOR_SHIFT;
+
+	if (new_size % SECTOR_SIZE) {
+		log_errno(EINVAL, "Size not a multiple of 512");
+		return -1;
+	}
+
+	if (!vg_check_write_mode(pv->vg)) {
+		return -1;
+	}
+
+	if (!pv_resize(pv->vg->cmd, pv->vg, pv, size)) {
+		log_error("PV re-size failed!");
+		return -1;
+	} else {
+		return 0;
+	}
 }

index 2f0693a..abf8432 100644
@@ -30,7 +30,6 @@ static int _pv_resize_single(struct cmd_context *cmd,
 			     const uint64_t new_size)
 {
 	struct pv_list *pvl;
-	uint64_t size = 0;
 	int r = 0;
 	const char *pv_name = pv_dev_name(pv);
 	const char *vg_name = pv_vg_name(pv);

@@ -70,33 +69,10 @@ static int _pv_resize_single(struct cmd_context *cmd,
 			goto out;
 	}
 
-	if (!(pv->fmt->features & FMT_RESIZE_PV)) {
-		log_error("Physical volume %s format does not support resizing.",
-			  pv_name);
-		goto out;
-	}
-
-	/* Get new size */
-	if (!dev_get_size(pv_dev(pv), &size)) {
-		log_error("%s: Couldn't get size.", pv_name);
+	if( !pv_resize(cmd, vg, pv, new_size)) {
 		goto out;
 	}
 
-	if (new_size) {
-		if (new_size > size)
-			log_warn("WARNING: %s: Overriding real size. "
-				  "You could lose data.", pv_name);
-		log_verbose("%s: Pretending size is %" PRIu64 " not %" PRIu64
-			    " sectors.", pv_name, new_size, pv_size(pv));
-		size = new_size;
-	}
-
-	log_verbose("Resizing volume \"%s\" to %" PRIu64 " sectors.",
-		    pv_name, pv_size(pv));
-
-	if (!pv_resize(pv, vg, size))
-		goto_out;
-
 	log_verbose("Updating physical volume \"%s\"", pv_name);
 
 	/* Write PV label only if this an orphan PV or it has 2nd mda. */

index a3a3d0e..4edf7e1 100644
@@ -77,6 +77,7 @@ static const struct flag _lv_flags[] = {
 	{THIN_POOL, NULL, 0},
 	{THIN_POOL_DATA, NULL, 0},
 	{THIN_POOL_METADATA, NULL, 0},
+	{LV_RESIZE, NULL, 0},
 	{0, NULL, 0}
 };
 

677 lines not on this page · raw message

101 lines not on this page · raw message

111 lines not on this page · raw message

index 4b73db4..1dafa57 100644
@@ -38,3 +38,8 @@ percent_t make_percent(uint64_t numerator, uint64_t denominator)
     }
 }
 
+uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup)
+{
+	return (uint32_t)(((uint64_t)percents * (uint64_t)count +
+			   ((roundup) ? 99 : 0)) / 100);
+}

index bf30a7e..e0a2eae 100644
@@ -41,4 +41,6 @@ typedef enum {
 float percent_to_float(percent_t v);
 percent_t make_percent(uint64_t numerator, uint64_t denominator);
 
+uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup);
+
 #endif

index 00f92ab..7515973 100644
@@ -1365,8 +1365,6 @@ int lvm_lv_rename(lv_t lv, const char *new_name);
  *
  * \memberof lv_t
  *
- * NOTE: This function is currently not implemented.
- *
  * \param   lv
  * Logical volume handle.
  *

index 91948a6..8167fc3 100644
@@ -309,9 +309,22 @@ int lvm_lv_rename(lv_t lv, const char *new_name)
 
 int lvm_lv_resize(const lv_t lv, uint64_t new_size)
 {
-	/* FIXME: add lv resize code here */
-	log_error("NOT IMPLEMENTED YET");
-	return -1;
+	struct lvresize_params lp = { 0 };
+
+	lp.vg_name = lv->vg->name;
+	lp.lv_name = lv->name;
+	lp.sign = SIGN_NONE;
+	lp.percent = PERCENT_NONE;
+	lp.resize = LV_ANY;
+	lp.size = new_size >> SECTOR_SHIFT;
+	lp.ac_force = 1;	/* Assume the user has a good backup? */
+
+	if (ECMD_PROCESSED != lv_resize(lv->vg->cmd, lv->vg, &lp, &lv->vg->pvs)) {
+		log_verbose("LV Re-size failed.");
+		return -1;
+	}
+
+	return 0;
 }
 
 lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name, uint64_t max_snap_size)

853 lines not on this page · raw message

index 669d772..9b7916a 100644
@@ -1814,9 +1814,3 @@ int change_tag(struct cmd_context *cmd, struct volume_group *vg,
 	return 1;
 }
 
-/* Return percents of extents and avoid overflow, with optional roundup */
-uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup)
-{
-	return (uint32_t)(((uint64_t)percents * (uint64_t)count +
-			   ((roundup) ? 99 : 0)) / 100);
-}

index a3ad9fd..19ba181 100644
@@ -34,7 +34,6 @@
 #include "dev-cache.h"
 #include "device.h"
 #include "display.h"
-#include "errors.h"
 #include "filter.h"
 #include "filter-composite.h"
 #include "filter-persistent.h"

@@ -73,21 +72,6 @@ enum {
 #undef arg
 };
 
-typedef enum {
-	SIGN_NONE = 0,
-	SIGN_PLUS = 1,
-	SIGN_MINUS = 2
-} sign_t;
-
-typedef enum {
-	PERCENT_NONE = 0,
-	PERCENT_VG,
-	PERCENT_FREE,
-	PERCENT_LV,
-	PERCENT_PVS,
-	PERCENT_ORIGIN
-} percent_type_t;
-
 #define ARG_COUNTABLE 0x00000001	/* E.g. -vvvv */
 #define ARG_GROUPABLE 0x00000002	/* E.g. --addtag */
 

@@ -187,7 +171,6 @@ int lvconvert_poll(struct cmd_context *cmd, struct logical_volume *lv, unsigned
 int mirror_remove_missing(struct cmd_context *cmd,
 			  struct logical_volume *lv, int force);
 
-uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup);
 
 int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
 		       activation_change_t activate);

index 906825e..10f466e 100644
@@ -26,6 +26,9 @@
 
 static lvm_t libh;
 
+/*Determines if we should write out changes automatically for vg state change*/
+static int auto_vg_write;
+
 
 typedef struct {
 	PyObject_HEAD

@@ -88,6 +91,14 @@ liblvm_get_last_error(void)
 	return info;
 }
 
+static int lvm_vg_write_auto(vg_t vg)
+{
+	if (auto_vg_write) {
+		return lvm_vg_write(vg);
+	}
+	return 0;
+}
+
 static PyObject *
 liblvm_library_get_version(void)
 {

@@ -152,6 +163,27 @@ liblvm_lvm_list_vg_uuids(void)
 	return pytuple;
 }
 
+/* Return the previous value, set current to passed in */
+static PyObject *
+liblvm_lvm_vg_autowrite(PyObject *self, PyObject *arg)
+{
+	PyObject *prev = NULL;
+	int rval = 0;
+	int bool = 0;
+
+	LVM_VALID();
+
+	/* In later version of python they introduced "p" */
+	if (!PyArg_ParseTuple(arg, "i", &bool))
+		return NULL;
+
+	prev = (auto_vg_write) ? Py_True : Py_False;
+	Py_INCREF(prev);
+	auto_vg_write = bool;
+
+	return prev;
+}
+
 static PyObject *
 liblvm_lvm_percent_to_float(PyObject *self, PyObject *arg)
 {

@@ -374,6 +406,32 @@ liblvm_lvm_vg_close(vgobject *self)
 }
 
 static PyObject *
+liblvm_lvm_vg_write(vgobject *self)
+{
+	int rval;
+
+	VG_VALID(self);
+
+	if (!auto_vg_write) {
+		rval = lvm_vg_write(self->vg);
+		if (-1 == rval) {
+			PyErr_SetObject(LibLVMError, liblvm_get_last_error());
+			return NULL;
+		} else {
+			Py_INCREF(Py_None);
+			return Py_None;
+		}
+	}
+
+	/*
+	 * Can't call this function directly if we have auto vg write
+	 * enabled
+	 */
+	PyErr_SetString(PyExc_ValueError, "lvm.vgAutoWrite() == True"); \
+	return NULL;
+}
+
+static PyObject *
 liblvm_lvm_vg_get_name(vgobject *self)
 {
 	VG_VALID(self);

@@ -400,14 +458,17 @@ liblvm_lvm_vg_remove(vgobject *self)
 	if ((rval = lvm_vg_remove(self->vg)) == -1)
 		goto error;
 
-	if (lvm_vg_write(self->vg) == -1)
-		goto error;
+	/* If we aren't writing out the change leave the object ref. alone */
+	if (auto_vg_write) {
 
-	/* Not much you can do with a vg that is removed so close it */
-	if (lvm_vg_close(self->vg) == -1)
-		goto error;
+		if (lvm_vg_write(self->vg) == -1)
+			goto error;
 
-	self->vg = NULL;
+		if (lvm_vg_close(self->vg) == -1)
+			goto error;
+
+		self->vg = NULL;
+	}
 
 	Py_INCREF(Py_None);
 	return Py_None;

@@ -432,8 +493,9 @@ liblvm_lvm_vg_extend(vgobject *self, PyObject *args)
 	if ((rval = lvm_vg_extend(self->vg, device)) == -1)
 		goto error;
 
-	if (lvm_vg_write(self->vg) == -1)
+	if (lvm_vg_write_auto(self->vg) == -1) {
 		goto error;
+	}
 
 	Py_INCREF(Py_None);
 	return Py_None;

@@ -458,8 +520,9 @@ liblvm_lvm_vg_reduce(vgobject *self, PyObject *args)
 	if ((rval = lvm_vg_reduce(self->vg, device)) == -1)
 		goto error;
 
-	if (lvm_vg_write(self->vg) == -1)
+	if (lvm_vg_write_auto(self->vg) == -1) {
 		goto error;
+	}
 
 	Py_INCREF(Py_None);
 	return Py_None;

@@ -483,8 +546,9 @@ liblvm_lvm_vg_add_tag(vgobject *self, PyObject *args)
 	if ((rval = lvm_vg_add_tag(self->vg, tag)) == -1)
 		goto error;
 
-	if (lvm_vg_write(self->vg) == -1)
+	if (lvm_vg_write_auto(self->vg) == -1) {
 		goto error;
+	}
 
 	return Py_BuildValue("i", rval);
 

@@ -508,8 +572,9 @@ liblvm_lvm_vg_remove_tag(vgobject *self, PyObject *args)
 	if ((rval = lvm_vg_remove_tag(self->vg, tag)) == -1)
 		goto error;
 
-	if (lvm_vg_write(self->vg) == -1)
+	if (lvm_vg_write_auto(self->vg) == -1) {
 		goto error;
+	}
 
 	Py_INCREF(Py_None);
 	return Py_None;

@@ -731,7 +796,7 @@ liblvm_lvm_vg_set_property(vgobject *self, PyObject *args)
 		goto lvmerror;
 	}
 
-	if (lvm_vg_write(self->vg) == -1) {
+	if (lvm_vg_write_auto(self->vg) == -1) {
 		goto lvmerror;
 	}
 

@@ -1553,6 +1618,7 @@ static PyMethodDef Liblvm_methods[] = {
 	{ "percentToFloat",	(PyCFunction)liblvm_lvm_percent_to_float, METH_VARARGS },
 	{ "vgNameFromPvid",	(PyCFunction)liblvm_lvm_vgname_from_pvid, METH_VARARGS },
 	{ "vgNameFromDevice",	(PyCFunction)liblvm_lvm_vgname_from_device, METH_VARARGS },
+	{ "vgAutoWrite",	(PyCFunction)liblvm_lvm_vg_autowrite, METH_VARARGS },
 	{ NULL, NULL }		/* sentinel */
 };
 

@@ -1589,6 +1655,7 @@ static PyMethodDef liblvm_vg_methods[] = {
 	{ "pvFromUuid", 	(PyCFunction)liblvm_lvm_pv_from_uuid, METH_VARARGS },
 	{ "getTags",		(PyCFunction)liblvm_lvm_vg_get_tags, METH_NOARGS },
 	{ "createLvLinear",	(PyCFunction)liblvm_lvm_vg_create_lv_linear, METH_VARARGS },
+	{ "write",			(PyCFunction)liblvm_lvm_vg_write, METH_VARARGS },
 	{ NULL, NULL }		/* sentinel */
 };
 

@@ -1704,6 +1771,7 @@ initlvm(void)
 {
 	PyObject *m;
 
+	auto_vg_write = 1;
 	libh = lvm_init(NULL);
 
 	if (PyType_Ready(&LibLVMvgType) < 0)