lvconvert: provide useful error when snapshot-merge target missing
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
Convey need for snapshot-merge target in lvconvert error message and man page.
Add ->target_name to segtype_handler to allow a more specific target name to be returned based on the state of the segment.
Before:
# lvconvert --merge vg/snap Can't expand LV lv: snapshot target support missing from kernel? Failed to suspend origin lv
After:
# lvconvert --merge vg/snap Can't process LV lv: snapshot-merge target support missing from kernel? Failed to suspend origin lv Unable to merge LV "snap" into it's origin.
--- lib/activate/dev_manager.c | 10 +++++++--- lib/metadata/segtype.h | 1 + lib/snapshot/snapshot.c | 9 +++++++++ man/lvconvert.8.in | 6 ++++-- tools/lvconvert.c | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-)
lib/activate/dev_manager.c +7 -3
@@ -1350,19 +1350,23 @@ static int _add_segment_to_dtree(struct dev_manager *dm,uint32_t s;struct dm_list *snh;struct lv_segment *seg_present; +const char *target_name;/* Ensure required device-mapper targets are loaded */ seg_present =find_cow (seg->lv) ? : seg; + target_name = (seg_present->segtype->ops->target_name ? + seg_present->segtype->ops->target_name (seg_present) : + seg_present->segtype->name);log_debug ("Checking kernel supports %s segment type for %s%s%s" , - seg_present->segtype->name, seg->lv->name, + target_name, seg->lv->name, layer ?"-" :"" , layer ? :"" );if (seg_present->segtype->ops->target_present && !seg_present->segtype->ops->target_present (seg_present->lv->vg->cmd, seg_present,NULL )) { -log_error ("Can't expand LV %s: %s target support missing " -"from kernel?" , seg->lv->name, seg_present->segtype->name); +log_error ("Can't process LV %s: %s target support missing " +"from kernel?" , seg->lv->name, target_name);return 0 ; }
lib/metadata/segtype.h +1 -0
@@ -66,6 +66,7 @@ struct segment_type {struct segtype_handler {const char *(*name) (const struct lv_segment * seg); +const char *(*target_name) (const struct lv_segment * seg);void (*display) (const struct lv_segment * seg);int (*text_export) (const struct lv_segment * seg,struct formatter * f);
lib/snapshot/snapshot.c +9 -0
@@ -28,6 +28,14 @@ static const char *_snap_name(const struct lv_segment *seg)return seg->segtype->name; } +static const char *_snap_target_name (const struct lv_segment *seg) +{ +if (seg->status &MERGING ) +return "snapshot-merge" ; + +return _snap_name (seg); +} +static int _snap_text_import (struct lv_segment *seg,const struct config_node *sn,struct dm_hash_table *pv_hash __attribute__((unused))) {
@@ -217,6 +225,7 @@ static void _snap_destroy(const struct segment_type *segtype)static struct segtype_handler _snapshot_ops = { .name = _snap_name, + .target_name = _snap_target_name, .text_import = _snap_text_import, .text_export = _snap_text_export, .target_status_compatible = _snap_target_status_compatible,
man/lvconvert.8.in +4 -2
@@ -135,8 +135,10 @@ Controls zeroing of the first KB of data in the snapshot. If the volume is read-only the snapshot will not be zeroed. .TP .I \-\-merge -Merges a snapshot into its origin volume. If both the origin and snapshot volume -are not open the merge will start immediately. Otherwise, the merge will start +Merges a snapshot into its origin volume. To check if your kernel +supports this feature, look for 'snapshot-merge' in the output +of 'dmsetup targets'. If both the origin and snapshot volume are not +open the merge will start immediately. Otherwise, the merge will start the first time either the origin or snapshot are activated and both are closed. Merging a snapshot into an origin that cannot be closed, for example a root filesystem, is deferred until the next time the origin volume is activated.
tools/lvconvert.c +1 -1
@@ -1561,7 +1561,7 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,return ECMD_FAILED ; }if (!lvconvert_merge (cmd, lv, lp)) { - stack; +log_error ("Unable to merge LV \"%s\" into it's origin." , lv->name);return ECMD_FAILED ; } }else if (lp->snapshot) {
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
lib/metadata/segtype.h struct segment_type { · line 72
Quoted 13 lines · Mike Snitzer
Convey need for snapshot-merge target in lvconvert error message and man page.
lib/metadata/segtype.h +1
-0@@ -66,6 +66,7 @@ struct segment_type {struct segtype_handler {const char *(*name) (const struct lv_segment * seg); +const char *(*target_name) (const struct lv_segment * seg);void (*display) (const struct lv_segment * seg);int (*text_export) (const struct lv_segment * seg,struct formatter * f);
I think this will break shared (external) segment module ABI. Nobody uses that but worth to mention it.
(See e.g. lib/mirror and --with-mirrors=shared)
Otherwise ack.
Milan
Quoted 8 lines · Milan Broz
Quoted 7 lines · Mike Snitzer
Convey need for snapshot-merge target in lvconvert error message and man page.
lib/metadata/segtype.h +0
-0@@ -66,6 +66,7 @@ struct segment_type {
Quoted 10 lines
lib/metadata/segtype.h struct segment_type { · line 72
Quoted 6 lines
lib/metadata/segtype.h +1
-0struct segtype_handler {const char *(*name) (const struct lv_segment * seg); +const char *(*target_name) (const struct lv_segment * seg);void (*display) (const struct lv_segment * seg);int (*text_export) (const struct lv_segment * seg,struct formatter * f);I think this will break shared (external) segment module ABI. Nobody uses that but worth to mention it.
(See e.g. lib/mirror and --with-mirrors=shared)
OK, I'm not familiar with that ABI concern. Any ideas on how I avoid this breakage? Add function pointer to end of struct? Or any change to struct will be taken as breakage?
Mike
Quoted 22 lines · Mike Snitzer
Quoted 8 lines · Milan Broz
Quoted 7 lines · Mike Snitzer
Convey need for snapshot-merge target in lvconvert error message and man page.
lib/metadata/segtype.h +0
-0@@ -66,6 +66,7 @@ struct segment_type {Quoted 10 lines
lib/metadata/segtype.h struct segment_type { · line 72
Quoted 6 lines
lib/metadata/segtype.h +1
-0struct segtype_handler {const char *(*name) (const struct lv_segment * seg); +const char *(*target_name) (const struct lv_segment * seg);void (*display) (const struct lv_segment * seg);int (*text_export) (const struct lv_segment * seg,struct formatter * f);I think this will break shared (external) segment module ABI. Nobody uses that but worth to mention it.
(See e.g. lib/mirror and --with-mirrors=shared)
Quoted 3 lines
OK, I'm not familiar with that ABI concern. Any ideas on how I avoid this breakage? Add function pointer to end of struct? Or any change to struct will be taken as breakage?
Well, git history shows that it was broken several times already...
So ignore it and just add the function there ;-)
Milan
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
In reply to Milan BrozQuoted 1 line · Milan Broz
I think this will break shared (external) segment module ABI.
Indeed - we make no guarantees for that ABI and don't even bother versioning it. We don't believe there are any out-of-tree users.
Alasdair
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
Dne 13.10.2010 23:42, Alasdair G Kergon napsal(a):
Quoted 6 lines · Milan Broz
Quoted 1 line
I think this will break shared (external) segment module ABI.
Indeed - we make no guarantees for that ABI and don't even bother versioning it. We don't believe there are any out-of-tree users.
I'd propose to drop/turn off this feature completely - targets usually cannot work without heavy tweaking through the rest of the code anyway. So in fact we rather 'pretend' there is such functionality.
Zdenek
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
Quoted 3 lines · Zdenek Kabelac
I'd propose to drop/turn off this feature completely - targets usually cannot work without heavy tweaking through the rest of the code anyway. So in fact we rather 'pretend' there is such functionality.
The reason for the shared libraries is so that a distro can ship support for older formats like LVM1 or pool but people who know they don't need it don't have to have it loaded it all the time.
There's no problem to fix here IMHO, but if there was, we'd simply attach the full version (2.02.72) to the soname of those libraries to enforce the requirement to recompile.
Alasdair
PATCH 1/1 lvconvert: provide useful error when snapshot-merge target missing
Dne 14.10.2010 13:24, Alasdair G Kergon napsal(a):
Quoted 9 lines · Zdenek Kabelac
Quoted 3 lines
I'd propose to drop/turn off this feature completely - targets usually cannot work without heavy tweaking through the rest of the code anyway. So in fact we rather 'pretend' there is such functionality.
The reason for the shared libraries is so that a distro can ship support for older formats like LVM1 or pool but people who know they don't need it don't have to have it loaded it all the time.
Those object files take like 30KB and we are memory locking a lot of MB of various glibc and other libs wasteful code...
The main problem I can see is - that things like support of snapshot are not concentrated in one little object file - but in a lot of other places. So we do not have clean enough border for this API.
And in effect we would actually consume quite few KB more in case those libs would be used dynamically and while we extend lvm library with user API - we actually waste probably far more space - which is not commonly needed.
Zdenek
Quoted 11 lines · Zdenek Kabelac
Dne 13.10.2010 23:42, Alasdair G Kergon napsal(a):
Quoted 6 lines · Milan Broz
Quoted 1 line
I think this will break shared (external) segment module ABI.
Indeed - we make no guarantees for that ABI and don't even bother versioning it. We don't believe there are any out-of-tree users.
I'd propose to drop/turn off this feature completely - targets usually cannot work without heavy tweaking through the rest of the code anyway. So in fact we rather 'pretend' there is such functionality.
I'm not following what you're saying. There is no pretending here...
The feature fails gracefully with an informative error message.
What's the problem?
Mike
Quoted 15 lines · Mike Snitzer
Quoted 11 lines · Zdenek Kabelac
Dne 13.10.2010 23:42, Alasdair G Kergon napsal(a):
Quoted 6 lines · Milan Broz
Quoted 1 line
I think this will break shared (external) segment module ABI.
Indeed - we make no guarantees for that ABI and don't even bother versioning it. We don't believe there are any out-of-tree users.
I'd propose to drop/turn off this feature completely - targets usually cannot work without heavy tweaking through the rest of the code anyway. So in fact we rather 'pretend' there is such functionality.
Quoted 5 lines
I'm not following what you're saying. There is no pretending here...
The feature fails gracefully with an informative error message.
What's the problem?
I hope just misunderstanding:)
I think Zdenek means shared segment feature,
not your patch & snapshot merge.
If not, I just added my 2 Eurocents to confusion:-)
Milan