lvm2-commits November 2016

lvm2-commits@lists.fedorahosted.org

7 participants
113 discussions

master - cleanup: use display_lvname and msg cleanup
by Zdenek Kabelac 23 Nov '16

23 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5fd5cfe06143cc73… Commit: 5fd5cfe06143cc7323efb9b76a4d520cc9442df8 Parent: 0ad95b77d0f3eb38bc678bf15ecb899e109287cc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Nov 16 15:11:07 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Nov 23 17:48:01 2016 +0100 cleanup: use display_lvname and msg cleanup Use display_lvname in tracing messages. Add some missing 'dots' to messages. --- daemons/dmeventd/plugins/raid/dmeventd_raid.c | 2 +- lib/metadata/lv_manip.c | 21 ++-- lib/metadata/mirror.c | 212 +++++++++++++------------ lib/metadata/raid_manip.c | 4 +- tools/lvconvert.c | 8 +- 5 files changed, 126 insertions(+), 121 deletions(-) diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c index 9df5f1d..a207c99 100644 --- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c +++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c @@ -61,7 +61,7 @@ static int _process_raid_event(struct dso_state *state, char *params, const char if (status->insync_regions < status->total_regions) { if (!state->warned) log_warn("WARNING: waiting for resynchronization to finish " - "before initiating repair on RAID device %s", device); + "before initiating repair on RAID device %s.", device); state->warned = 1; goto out; /* Not yet done syncing with accessible devices */ diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 0643000..58be1db 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1132,14 +1132,15 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num, struct logical_volume *lv, uint32_t le, uint64_t status) { - log_very_verbose("Stack %s:%" PRIu32 "[%" PRIu32 "] on LV %s:%" PRIu32, - seg->lv->name, seg->le, area_num, lv->name, le); + log_very_verbose("Stack %s:" FMTu32 "[" FMTu32 "] on LV %s:" FMTu32 ".", + display_lvname(seg->lv), seg->le, area_num, + display_lvname(lv), le); if (status & RAID_META) { seg->meta_areas[area_num].type = AREA_LV; seg_metalv(seg, area_num) = lv; if (le) { - log_error(INTERNAL_ERROR "Meta le != 0"); + log_error(INTERNAL_ERROR "Meta le != 0."); return 0; } seg_metale(seg, area_num) = 0; @@ -3617,16 +3618,16 @@ int lv_add_mirror_areas(struct alloc_handle *ah, dm_list_iterate_items(aa, &ah->alloced_areas[0]) { if (!(seg = find_seg_by_le(lv, current_le))) { - log_error("Failed to find segment for %s extent %" - PRIu32, lv->name, current_le); + log_error("Failed to find segment for %s extent " FMTu32 ".", + display_lvname(lv), current_le); return 0; } /* Allocator assures aa[0].len <= seg->area_len */ if (aa[0].len < seg->area_len) { if (!lv_split_segment(lv, seg->le + aa[0].len)) { - log_error("Failed to split segment at %s " - "extent %" PRIu32, lv->name, le); + log_error("Failed to split segment at %s extent " FMTu32 ".", + display_lvname(lv), le); return 0; } } @@ -3675,7 +3676,7 @@ int lv_add_mirror_lvs(struct logical_volume *lv, seg = first_seg(lv); if (dm_list_size(&lv->segments) != 1 || seg_type(seg, 0) != AREA_LV) { - log_error("Mirror layer must be inserted before adding mirrors"); + log_error("Mirror layer must be inserted before adding mirrors."); return 0; } @@ -3685,7 +3686,7 @@ int lv_add_mirror_lvs(struct logical_volume *lv, return_0; if (region_size && region_size != seg->region_size) { - log_error("Conflicting region_size"); + log_error("Conflicting region_size."); return 0; } @@ -3694,7 +3695,7 @@ int lv_add_mirror_lvs(struct logical_volume *lv, if (!_lv_segment_add_areas(lv, seg, new_area_count)) { log_error("Failed to allocate widened LV segment for %s.", - lv->name); + display_lvname(lv)); return 0; } diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index feb78a5..f5a3676 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -136,16 +136,15 @@ struct lv_segment *find_mirror_seg(struct lv_segment *seg) { struct lv_segment *mirror_seg; - mirror_seg = get_only_segment_using_this_lv(seg->lv); - - if (!mirror_seg) { - log_error("Failed to find mirror_seg for %s", seg->lv->name); + if (!(mirror_seg = get_only_segment_using_this_lv(seg->lv))) { + log_error("Failed to find mirror_seg for %s", display_lvname(seg->lv)); return NULL; } if (!seg_is_mirrored(mirror_seg)) { - log_error("%s on %s is not a mirror segments", - mirror_seg->lv->name, seg->lv->name); + log_error("LV %s on %s is not a mirror segments.", + display_lvname(mirror_seg->lv), + display_lvname(seg->lv)); return NULL; } @@ -246,7 +245,7 @@ int shift_mirror_images(struct lv_segment *mirrored_seg, unsigned mimage) if (mimage >= mirrored_seg->area_count) { log_error("Invalid index (%u) of mirror image supplied " - "to shift_mirror_images()", mimage); + "to shift_mirror_images().", mimage); return 0; } @@ -282,21 +281,22 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv) log_header.nr_regions = xlate64((uint64_t)-1); if (!(name = dm_pool_alloc(cmd->mem, PATH_MAX))) { - log_error("Name allocation failed - log header not written (%s)", - lv->name); + log_error("Name allocation failed - log header not written (%s).", + display_lvname(lv)); return 0; } if (dm_snprintf(name, PATH_MAX, "%s%s/%s", cmd->dev_dir, lv->vg->name, lv->name) < 0) { - log_error("Name too long - log header not written (%s)", lv->name); + log_error("Name too long - log header not written (%s).", + display_lvname(lv)); return 0; } - log_verbose("Writing log header to device, %s", lv->name); + log_verbose("Writing log header to device %s.", display_lvname(lv)); if (!(dev = dev_cache_get(name, NULL))) { - log_error("%s: not found: log header not written", name); + log_error("%s: not found: log header not written.", name); return 0; } @@ -304,7 +304,7 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv) return 0; if (!dev_write(dev, UINT64_C(0), sizeof(log_header), &log_header)) { - log_error("Failed to write log header to %s", name); + log_error("Failed to write log header to %s.", name); dev_close_immediate(dev); return 0; } @@ -663,8 +663,8 @@ static int _split_mirror_images(struct logical_volume *lv, struct cmd_context *cmd = lv->vg->cmd; if (!lv_is_mirrored(lv)) { - log_error("Unable to split non-mirrored LV, %s", - lv->name); + log_error("Unable to split non-mirrored LV %s.", + display_lvname(lv)); return 0; } @@ -673,8 +673,8 @@ static int _split_mirror_images(struct logical_volume *lv, return 0; } - log_verbose("Detaching %d images from mirror, %s", - split_count, lv->name); + log_verbose("Detaching %d images from mirror %s.", + split_count, display_lvname(lv)); if (!_move_removable_mimages_to_end(lv, split_count, removable_pvs)) { /* @@ -684,8 +684,7 @@ static int _split_mirror_images(struct logical_volume *lv, * removable PVs or all of them. Should we allow * them to just specify some - making us pick the rest? */ - log_error("Insufficient removable PVs given" - " to satisfy request"); + log_error("Insufficient removable PVs given to satisfy request."); return 0; } @@ -704,7 +703,7 @@ static int _split_mirror_images(struct logical_volume *lv, if (!release_lv_segment_area(mirrored_seg, mirrored_seg->area_count, mirrored_seg->area_len)) return_0; - log_very_verbose("%s assigned to be split", sub_lv->name); + log_very_verbose("LV %s assigned to be split.", display_lvname(sub_lv)); if (!new_lv) { lv_set_visible(sub_lv); @@ -715,7 +714,7 @@ static int _split_mirror_images(struct logical_volume *lv, /* If there is more than one image being split, add to list */ lvl = dm_pool_alloc(lv->vg->vgmem, sizeof(*lvl)); if (!lvl) { - log_error("lv_list alloc failed"); + log_error("lv_list alloc failed."); return 0; } lvl->lv = sub_lv; @@ -738,8 +737,8 @@ static int _split_mirror_images(struct logical_volume *lv, */ if (!insert_layer_for_lv(cmd, new_lv, 0, "_mimage_%d")) { - log_error("Failed to build new mirror, %s", - new_lv->name); + log_error("Failed to build new mirror, %s.", + display_lvname(new_lv)); return 0; } @@ -750,25 +749,25 @@ static int _split_mirror_images(struct logical_volume *lv, if (dm_snprintf(format, len, "%s_mimage_%%d", new_lv->name) < 0) { - log_error("Failed to build new image name."); + log_error("Failed to build new image name for %s.", + display_lvname(new_lv)); return 0; } - layer_name = dm_pool_alloc(lv->vg->vgmem, len); - if (!layer_name) { - log_error("Unable to allocate memory"); + if (!(layer_name = dm_pool_alloc(lv->vg->vgmem, len))) { + log_error("Unable to allocate memory."); return 0; } if (!generate_lv_name(lv->vg, format, layer_name, len)|| sscanf(layer_name, format, &i) != 1) { - log_error("Failed to generate new image names"); + log_error("Failed to generate new image names for %s.", + display_lvname(new_lv)); return 0; } sub_lv->name = layer_name; } if (!_merge_mirror_images(new_lv, &split_images)) { - log_error("Failed to group split " - "images into new mirror"); + log_error("Failed to group split images into new mirror."); return 0; } @@ -904,15 +903,14 @@ static int _remove_mirror_images(struct logical_volume *lv, if (removed) *removed = 0; - log_very_verbose("Reducing mirror set %s from %" PRIu32 " to %" - PRIu32 " image(s)%s.", lv->name, + log_very_verbose("Reducing mirror set %s from " FMTu32 " to " FMTu32 + " image(s)%s.", display_lvname(lv), old_area_count, old_area_count - num_removed, remove_log ? " and no log volume" : ""); if (collapse && (old_area_count - num_removed != 1)) { - log_error("Incompatible parameters to _remove_mirror_images"); + log_error("Incompatible parameters to _remove_mirror_images."); return 0; - } num_removed = 0; @@ -936,7 +934,8 @@ static int _remove_mirror_images(struct logical_volume *lv, */ if ((s == 0) && !_mirrored_lv_in_sync(lv) && !(lv_is_partial(lv))) { - log_error("Unable to remove primary mirror image while mirror is not in-sync"); + log_error("Unable to remove primary mirror image while mirror volume " + "%s is not in-sync.", display_lvname(lv)); return 0; } if (!shift_mirror_images(mirrored_seg, s)) @@ -965,7 +964,7 @@ static int _remove_mirror_images(struct logical_volume *lv, seg_lv(mirrored_seg, m)->status &= ~MIRROR_IMAGE; lv_set_visible(seg_lv(mirrored_seg, m)); if (!(lvl = dm_pool_alloc(lv->vg->cmd->mem, sizeof(*lvl)))) { - log_error("lv_list alloc failed"); + log_error("lv_list alloc failed."); return 0; } lvl->lv = seg_lv(mirrored_seg, m); @@ -987,7 +986,7 @@ static int _remove_mirror_images(struct logical_volume *lv, if (!remove_layer_from_lv(lv, temp_layer_lv)) return_0; if (collapse && !_merge_mirror_images(lv, &tmp_orphan_lvs)) { - log_error("Failed to add mirror images"); + log_error("Failed to add mirror images."); return 0; } /* @@ -1008,7 +1007,7 @@ static int _remove_mirror_images(struct logical_volume *lv, dm_list_iterate_items(pvmove_seg, &lv->segments) pvmove_seg->status |= PVMOVE; } else if (new_area_count == 0) { - log_very_verbose("All mimages of %s are gone", lv->name); + log_very_verbose("All mimages of %s are gone.", display_lvname(lv)); /* All mirror images are gone. * It can happen for vgreduce --removemissing. */ @@ -1037,8 +1036,8 @@ static int _remove_mirror_images(struct logical_volume *lv, lv_is_partial(detached_log_lv)) { struct lv_segment *seg = first_seg(detached_log_lv); - log_very_verbose("%s being removed due to failures", - detached_log_lv->name); + log_very_verbose("%s being removed due to failures.", + display_lvname(detached_log_lv)); /* * We are going to replace the mirror with an @@ -1047,20 +1046,19 @@ static int _remove_mirror_images(struct logical_volume *lv, * the sub-lv's) */ for (m = 0; m < seg->area_count; m++) { + if (!(lvl = dm_pool_alloc(lv->vg->cmd->mem, + sizeof(*lvl)))) + return_0; + seg_lv(seg, m)->status &= ~MIRROR_IMAGE; lv_set_visible(seg_lv(seg, m)); - if (!(lvl = dm_pool_alloc(lv->vg->cmd->mem, - sizeof(*lvl)))) { - log_error("dm_pool_alloc failed"); - return 0; - } lvl->lv = seg_lv(seg, m); dm_list_add(&tmp_orphan_lvs, &lvl->list); } if (!replace_lv_with_error_segment(detached_log_lv)) { - log_error("Failed error target substitution for %s", - detached_log_lv->name); + log_error("Failed error target substitution for %s.", + display_lvname(detached_log_lv)); return 0; } @@ -1095,14 +1093,13 @@ static int _remove_mirror_images(struct logical_volume *lv, * remove the LVs from the mirror set, commit that metadata * then deactivate and remove them fully. */ - if (!vg_write(mirrored_seg->lv->vg)) { log_error("intermediate VG write failed."); return 0; } if (!suspend_lv_origin(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) { - log_error("Failed to lock %s", mirrored_seg->lv->name); + log_error("Failed to lock %s.", display_lvname(mirrored_seg->lv)); vg_revert(mirrored_seg->lv->vg); return 0; } @@ -1115,7 +1112,7 @@ static int _remove_mirror_images(struct logical_volume *lv, * FIXME: check propagation of suspend with visible flag */ if (temp_layer_lv && !suspend_lv(temp_layer_lv->vg->cmd, temp_layer_lv)) - log_error("Problem suspending temporary LV %s", temp_layer_lv->name); + log_error("Problem suspending temporary LV %s.", display_lvname(temp_layer_lv)); if (!vg_commit(mirrored_seg->lv->vg)) { if (!resume_lv(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) @@ -1123,7 +1120,7 @@ static int _remove_mirror_images(struct logical_volume *lv, return_0; } - log_very_verbose("Updating \"%s\" in kernel", mirrored_seg->lv->name); + log_very_verbose("Updating %s in kernel.", display_lvname(mirrored_seg->lv)); /* * Avoid having same mirror target loaded twice simultaneously by first @@ -1132,12 +1129,12 @@ static int _remove_mirror_images(struct logical_volume *lv, * explicitly. */ if (temp_layer_lv && !resume_lv(temp_layer_lv->vg->cmd, temp_layer_lv)) { - log_error("Problem resuming temporary LV, %s", temp_layer_lv->name); + log_error("Problem resuming temporary LV %s.", display_lvname(temp_layer_lv)); return 0; } if (!resume_lv_origin(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) { - log_error("Problem reactivating %s", mirrored_seg->lv->name); + log_error("Problem reactivating %s.", display_lvname(mirrored_seg->lv)); return 0; } @@ -1162,7 +1159,8 @@ static int _remove_mirror_images(struct logical_volume *lv, 1, &lv->tags, 0)) { /* As a result, unnecessary sync may run after * collapsing. But safe.*/ - log_error("Failed to initialize log device"); + log_error("Failed to initialize log device %s.", + display_lvname(first_seg(lv)->log_lv)); return 0; } } @@ -1170,8 +1168,9 @@ static int _remove_mirror_images(struct logical_volume *lv, if (removed) *removed = old_area_count - new_area_count; - log_very_verbose(FMTu32 " image(s) removed from %s", - old_area_count - new_area_count, lv->name); + log_very_verbose(FMTu32 " image(s) removed from %s.", + old_area_count - new_area_count, + display_lvname(lv)); return 1; } @@ -1353,15 +1352,15 @@ static int _replace_mirror_images(struct lv_segment *mirrored_seg, /* FIXME: Use lvconvert rather than duplicating its code */ if (mirrored_seg->area_count < num_mirrors) { - log_warn("WARNING: Failed to replace mirror device in %s/%s", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Failed to replace mirror device in %s.", + display_lvname(mirrored_seg->lv); if ((mirrored_seg->area_count > 1) && !mirrored_seg->log_lv) - log_warn("WARNING: Use 'lvconvert -m %d %s/%s --corelog' to replace failed devices", - num_mirrors - 1, lv->vg->name, lv->name); + log_warn("WARNING: Use 'lvconvert -m %d %s --corelog' to replace failed devices.", + num_mirrors - 1, display_lvname(lv)); else - log_warn("WARNING: Use 'lvconvert -m %d %s/%s' to replace failed devices", - num_mirrors - 1, lv->vg->name, lv->name); + log_warn("WARNING: Use 'lvconvert -m %d %s' to replace failed devices.", + num_mirrors - 1, display_lvname(lv)); r = 0; /* REMEMBER/FIXME: set in_sync to 0 if a new mirror device was added */ @@ -1374,11 +1373,11 @@ static int _replace_mirror_images(struct lv_segment *mirrored_seg, */ if ((mirrored_seg->area_count > 1) && !mirrored_seg->log_lv && (log_policy != MIRROR_REMOVE)) { - log_warn("WARNING: Failed to replace mirror log device in %s/%s", - lv->vg->name, lv->name); + log_warn("WARNING: Failed to replace mirror log device in %s.", + display_lvname(lv)); - log_warn("WARNING: Use 'lvconvert -m %d %s/%s' to replace failed devices", - mirrored_seg->area_count - 1 , lv->vg->name, lv->name); + log_warn("WARNING: Use 'lvconvert -m %d %s' to replace failed devices.", + mirrored_seg->area_count - 1 , display_lvname(lv)); r = 0; } @@ -1411,8 +1410,8 @@ int reconfigure_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirr /* Unable to remove bad devices */ return 0; - log_warn("WARNING: Bad device removed from mirror volume, %s/%s", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Bad device removed from mirror volume %s.", + display_lvname(mirrored_seg->lv)); log_policy = _get_mirror_log_fault_policy(mirrored_seg->lv->vg->cmd); dev_policy = _get_mirror_device_fault_policy(mirrored_seg->lv->vg->cmd); @@ -1424,20 +1423,20 @@ int reconfigure_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirr if (!r) /* Failed to replace device(s) */ - log_warn("WARNING: Unable to find substitute device for mirror volume, %s/%s", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Unable to find substitute device for mirror volume %s.", + display_lvname(mirrored_seg->lv)); else if (r > 0) /* Success in replacing device(s) */ - log_warn("WARNING: Mirror volume, %s/%s restored - substitute for failed device found.", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Mirror volume %s restored - substitute for failed device found.", + display_lvname(mirrored_seg->lv)); else /* Bad device removed, but not replaced because of policy */ if (mirrored_seg->area_count == 1) { - log_warn("WARNING: Mirror volume, %s/%s converted to linear due to device failure.", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Mirror volume %s converted to linear due to device failure.", + display_lvname(mirrored_seg->lv); } else if (had_log && !mirrored_seg->log_lv) { - log_warn("WARNING: Mirror volume, %s/%s disk log removed due to device failure.", - mirrored_seg->lv->vg->name, mirrored_seg->lv->name); + log_warn("WARNING: Mirror volume %s disk log removed due to device failure.", + display_lvname(mirrored_seg->lv)); } /* * If we made it here, we at least removed the bad device. @@ -1734,23 +1733,26 @@ static int _add_mirrors_that_preserve_segments(struct logical_volume *lv, if (!(ah = allocate_extents(lv->vg, NULL, segtype, 1, mirrors, 0, 0, lv->le_count, allocatable_pvs, alloc, 0, parallel_areas))) { - log_error("Unable to allocate mirror extents for %s.", lv->name); + log_error("Unable to allocate mirror extents for %s.", + display_lvname(lv)); return 0; } if (flags & MIRROR_BY_SEG) { if (!lv_add_mirror_areas(ah, lv, 0, adjusted_region_size)) { - log_error("Failed to add mirror areas to %s", lv->name); + log_error("Failed to add mirror areas to %s.", + display_lvname(lv)); r = 0; } } else if (flags & MIRROR_BY_SEGMENTED_LV) { if (!lv_add_segmented_mirror_image(ah, lv, 0, adjusted_region_size)) { - log_error("Failed to add mirror areas to %s", lv->name); + log_error("Failed to add mirror areas to %s.", + display_lvname(lv)); r = 0; } } else { - log_error(INTERNAL_ERROR "Unknown mirror flag"); + log_error(INTERNAL_ERROR "Unknown mirror flag."); r = 0; } alloc_destroy(ah); @@ -1784,7 +1786,7 @@ int remove_mirror_log(struct cmd_context *cmd, /* Unimplemented features */ if (dm_list_size(&lv->segments) != 1) { - log_error("Multiple-segment mirror is not supported"); + log_error("Multiple-segment mirror is not supported."); return 0; } @@ -1796,19 +1798,19 @@ int remove_mirror_log(struct cmd_context *cmd, return 0; } } else if (lv_is_active(lv)) { - log_error("Unable to determine sync status of" - " remotely active mirror, %s", lv->name); + log_error("Unable to determine sync status of " + "remotely active mirror volume %s.", display_lvname(lv)); return 0; } else if (vg_is_clustered(vg)) { log_error("Unable to convert the log of an inactive " - "cluster mirror, %s", lv->name); + "cluster mirror volume %s.", display_lvname(lv)); return 0; - } else if (force || yes_no_prompt("Full resync required to convert " - "inactive mirror %s to core log. " - "Proceed? [y/n]: ", lv->name) == 'y') + } else if (force || yes_no_prompt("Full resync required to convert inactive " + "mirror volume %s to core log. " + "Proceed? [y/n]: ", display_lvname(lv)) == 'y') sync_percent = 0; else { - log_error("Logical volume %s NOT converted.", lv->name); + log_error("Logical volume %s NOT converted.", display_lvname(lv)); return 0; } @@ -1976,25 +1978,25 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, int r = 0; if (vg_is_clustered(lv->vg) && (log_count > 1)) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors"); + log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); return 0; } if (dm_list_size(&lv->segments) != 1) { - log_error("Multiple-segment mirror is not supported"); + log_error("Multiple-segment mirror is not supported."); return 0; } if (lv_is_active_but_not_locally(lv)) { log_error("Unable to convert the log of a mirror, %s, that is " - "active remotely but not locally", lv->name); + "active remotely but not locally.", display_lvname(lv)); return 0; } log_lv = first_seg(lv)->log_lv; old_log_count = (log_lv) ? lv_mirror_count(log_lv) : 0; if (old_log_count == log_count) { - log_verbose("Mirror already has a %s log", + log_verbose("Mirror %s already has a %s log.", display_lvname(lv), !log_count ? "core" : (log_count == 1) ? "disk" : "mirrored"); return 1; @@ -2138,7 +2140,7 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, struct dm_list *pvs, alloc_policy_t alloc, uint32_t flags) { if (!mirrors && !log_count) { - log_error("No conversion is requested"); + log_error("No conversion is requested."); return 0; } @@ -2158,7 +2160,7 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, * log daemon is multi-threaded. */ if (log_count > 1) { - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors"); + log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); return 0; } } @@ -2176,12 +2178,12 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, if (flags & MIRROR_BY_SEG) { if (log_count) { log_error("Persistent log is not supported on " - "segment-by-segment mirroring"); + "segment-by-segment mirroring."); return 0; } if (stripes > 1) { log_error("Striped-mirroring is not supported on " - "segment-by-segment mirroring"); + "segment-by-segment mirroring."); return 0; } @@ -2191,7 +2193,7 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, } else if (flags & MIRROR_BY_SEGMENTED_LV) { if (stripes > 1) { log_error("Striped-mirroring is not supported on " - "segment-by-segment mirroring"); + "segment-by-segment mirroring."); return 0; } @@ -2207,7 +2209,8 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv, pvs, alloc, log_count); } - log_error("Unsupported mirror conversion type"); + log_error("Unsupported mirror conversion type."); + return 0; } @@ -2219,14 +2222,15 @@ int lv_split_mirror_images(struct logical_volume *lv, const char *split_name, if (lv_name_is_used_in_vg(lv->vg, split_name, &historical)) { log_error("%sLogical Volume \"%s\" already exists in " - "volume group \"%s\"", historical ? "historical " : "", + "volume group \"%s\".", historical ? "historical " : "", split_name, lv->vg->name); return 0; } /* Can't split a mirror that is not in-sync... unless force? */ if (!_mirrored_lv_in_sync(lv)) { - log_error("Unable to split mirror that is not in-sync."); + log_error("Unable to split mirror %s that is not in-sync.", + display_lvname(lv)); return 0; } @@ -2263,18 +2267,18 @@ int lv_remove_mirrors(struct cmd_context *cmd __attribute__((unused)), struct lv_segment *seg; if (!mirrors && !log_count) { - log_error("No conversion is requested"); + log_error("No conversion is requested."); return 0; } seg = first_seg(lv); if (!seg_is_mirrored(seg)) { - log_error("Not a mirror segment"); + log_error("Not a mirror segment."); return 0; } if (lv_mirror_count(lv) <= mirrors) { - log_error("Removing more than existing: %d <= %d", + log_error("Removing more than existing: %d <= %d.", seg->area_count, mirrors); return 0; } @@ -2290,7 +2294,7 @@ int lv_remove_mirrors(struct cmd_context *cmd __attribute__((unused)), /* MIRROR_BY_SEG */ if (log_count) { log_error("Persistent log is not supported on " - "segment-by-segment mirroring"); + "segment-by-segment mirroring."); return 0; } return remove_mirrors_from_segments(lv, new_mirrors, status_mask); diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index cf4cce1..e91667e 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -283,8 +283,8 @@ static int _raid_in_sync(struct logical_volume *lv) * https://bugzilla.redhat.com/1210637 */ if (!lv_raid_percent(lv, &sync_percent)) { - log_error("Unable to determine sync status of %s/%s.", - lv->vg->name, lv->name); + log_error("Unable to determine sync status of %s.", + display_lvname(lv)); return 0; } if (sync_percent > DM_PERCENT_0) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index ceeff2d..6165320 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1484,7 +1484,8 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd, */ if (lv_is_origin(lv)) { log_error("Can't add additional mirror images to " - "mirrors that are under snapshots,"); + "mirror %s which is under snapshots.", + display_lvname(lv)); return 0; } @@ -1767,13 +1768,12 @@ static int _lvconvert_mirrors(struct cmd_context *cmd, uint32_t new_log_count; if ((lp->corelog || lp->mirrorlog) && *lp->type_str && strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) { - log_error("--corelog and --mirrorlog are only compatible with mirror devices"); + log_error("--corelog and --mirrorlog are only compatible with mirror devices."); return 0; } if (lp->merge_mirror) { - log_error("Unable to merge mirror images" - "of segment type 'mirror'."); + log_error("Unable to merge mirror images of segment type 'mirror'."); return 0; }

1 0

master - mirror: preserve MIRRORED status for temporara image
by Zdenek Kabelac 23 Nov '16

23 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0ad95b77d0f3eb38… Commit: 0ad95b77d0f3eb38bc678bf15ecb899e109287cc Parent: 851095a6af7a5a1343d9eb2aa8a5c9e08f9759b3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Nov 23 17:11:26 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Nov 23 17:47:58 2016 +0100 mirror: preserve MIRRORED status for temporara image When lvconvert adds a new leg - it's doing it free 'temporary' image layer - however this temporary 'internal' mirror is also MIRRORED LV. But the status bit was not properly transfered through layer. --- WHATS_NEW | 1 + lib/metadata/mirror.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b7a5e82..40a9ef4 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.168 - ==================================== + Preserve mirrored status for temporary layered mirrors. Use transient raid check before repairing raid volume. Implement transient status check for raid volumes. Only log msg as debug if lvm2-lvmdbusd unit missing for D-Bus notification. diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index da7be6c..feb78a5 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -1883,7 +1883,9 @@ static int _form_mirror(struct cmd_context *cmd, struct alloc_handle *ah, return_0; if (!lv_add_mirror_lvs(lv, img_lvs, mirrors, - MIRROR_IMAGE | (lv->status & LOCKED), + /* Pass through MIRRORED & LOCKED status flag + * TODO: Any other would be needed ?? */ + MIRROR_IMAGE | (lv->status & (MIRRORED | LOCKED)), region_size)) { log_error("Aborting. Failed to add mirror segment. " "Remove new LV and retry.");

1 0

master - raid: lvconvert uses transient check for raid
by Zdenek Kabelac 23 Nov '16

23 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=851095a6af7a5a13… Commit: 851095a6af7a5a1343d9eb2aa8a5c9e08f9759b3 Parent: 23809379babf96459ae7135114b9c6302c9a014e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 21 14:54:51 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Nov 23 17:46:50 2016 +0100 raid: lvconvert uses transient check for raid Also check if the raid status isn't teling us there is something wrong with any raid image device. --- WHATS_NEW | 1 + tools/lvconvert.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 9414b03..b7a5e82 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.168 - ==================================== + Use transient raid check before repairing raid volume. Implement transient status check for raid volumes. Only log msg as debug if lvm2-lvmdbusd unit missing for D-Bus notification. Missing stripe filler now could be also 'zero'. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index d6824d8..ceeff2d 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2068,6 +2068,9 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l return 0; } + if (!lv_check_transient(lv)) /* TODO check this in lib for all commands? */ + stack; /* TODO: break here upon fail or always try to fix it? */ + _lvconvert_raid_repair_ask(cmd, lp, &replace); if (replace) {

1 0

master - raid: implement transient status check
by Zdenek Kabelac 23 Nov '16

23 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=23809379babf9645… Commit: 23809379babf96459ae7135114b9c6302c9a014e Parent: 2315743dd3826e880898bf62bb205931da8c1450 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 21 12:43:18 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Nov 23 17:45:44 2016 +0100 raid: implement transient status check Take into acount reported state from 'raid' targets. When raid leg is marked with 'D' - take it as missing leg. --- WHATS_NEW | 1 + lib/raid/raid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 7f8801a..9414b03 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.168 - ==================================== + Implement transient status check for raid volumes. Only log msg as debug if lvm2-lvmdbusd unit missing for D-Bus notification. Missing stripe filler now could be also 'zero'. lvconvert --repair accepts --interval and --background option. diff --git a/lib/raid/raid.c b/lib/raid/raid.c index 92a96a3..80af61e 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -349,6 +349,62 @@ static int _raid_target_percent(void **target_state, return 1; } +static int _raid_transient_status(struct dm_pool *mem, + struct lv_segment *seg, + char *params) +{ + int failed = 0, r = 0; + unsigned i; + struct lvinfo info; + struct logical_volume *lv; + struct dm_status_raid *sr; + + log_debug("Raid transient status %s.", params); + + if (!dm_get_status_raid(mem, params, &sr)) + return_0; + + if (sr->dev_count != seg->area_count) { + log_error("Active raid has a wrong number of raid images!"); + log_error("Metadata says %u, kernel says %u.", + seg->area_count, sr->dev_count); + goto out; + } + + if (seg->meta_areas) + for (i = 0; i < seg->area_count; ++i) { + lv = seg_metalv(seg, i); + if (!lv_info(lv->vg->cmd, lv, 0, &info, 0, 0)) { + log_error("Check for existence of raid meta %s failed.", + display_lvname(lv)); + goto out; + } + } + + for (i = 0; i < seg->area_count; ++i) { + lv = seg_lv(seg, i); + if (!lv_info(lv->vg->cmd, lv, 0, &info, 0, 0)) { + log_error("Check for existence of raid image %s failed.", + display_lvname(lv)); + goto out; + } + if (sr->dev_health[i] == 'D') { + lv->status |= PARTIAL_LV; + ++failed; + } + } + + /* Update PARTIAL_LV flags across the VG */ + if (failed) + vg_mark_partial_lvs(lv->vg, 0); + + r = 1; +out: + dm_pool_free(mem, sr); + + return r; +} + static int _raid_target_present(struct cmd_context *cmd, const struct lv_segment *seg __attribute__((unused)), unsigned *attributes) @@ -460,6 +516,7 @@ static struct segtype_handler _raid_ops = { #ifdef DEVMAPPER_SUPPORT .target_percent = _raid_target_percent, .target_present = _raid_target_present, + .check_transient_status = _raid_transient_status, .modules_needed = _raid_modules_needed, # ifdef DMEVENTD .target_monitored = _raid_target_monitored,

1 0

master - man: remove duplicate paragraph about selection criteria from lvm(8) man page
by Peter Rajnoha 22 Nov '16

22 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2315743dd3826e88… Commit: 2315743dd3826e880898bf62bb205931da8c1450 Parent: 0bbf63134974b85096a7949558f5546204a2a135 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Nov 22 13:20:52 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Nov 22 13:20:52 2016 +0100 man: remove duplicate paragraph about selection criteria from lvm(8) man page The paragraph about selection criteria together with all the related context is now documented in lvmreport(7) man page completely. --- man/lvm.8.in | 105 +-------------------------------------------------------- 1 files changed, 2 insertions(+), 103 deletions(-) diff --git a/man/lvm.8.in b/man/lvm.8.in index 0db0ee4..f1ffc7a 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -328,7 +328,7 @@ For reporting commands, display only rows that match \fISelection\fP criteria. All rows are displayed with the additional "selected" column (\fB-o selected\fP) showing 1 if the row matches the \fISelection\fP and 0 otherwise. For non-reporting commands which process LVM entities, the selection can be used to match items -to process. See \fBSELECTION CRITERIA\fP section of this man page for more +to process. See \fBSelection\fP section in \fBlvmreport\fP(7) man page for more information about the way the selection criteria are constructed. . .HP @@ -639,108 +639,6 @@ volume types are an example of this. Other logical volume types may require more than one command to create. The cache (\fBlvmcache\fP(7)) and thin provisioning (\fBlvmthin\fP(7)) types are examples of this. . -.SH SELECTION CRITERIA -. -The selection criteria are a set of \fBstatements\fP combined by \fBlogical -and grouping operators\fP. The \fBstatement\fP consists of \fBcolumn\fP -name for which a set of valid \fBvalues\fP is defined using -\fBcomparison operators\fP. For complete list of column names (fields) -that can be used in selection, see the output of \fB<lvm reporting command> -S help\fP. -.P -.SS Comparison operators \fR(cmp_op) -.sp -.PD 0 -.TP -.B =~ -Matching regular expression. -.TP -.B !~ -Not matching regular expression. -.TP -.B = -Equal to. -.TP -.B != -Not equal to. -.TP -.B >= -Greater than or equal to. -.TP -.B > -Greater than -.TP -.B <= -Less than or equal to. -.TP -.B < -Less than. -.PD -.P -.SS Binary logical operators \fR(cmp_log) -.sp -.PD 0 -.TP -.B && -All fields must match -.TP -.B , -All fields must match -.TP -.B || -At least one field must match -.TP -.B # -At least one field must match -.PD -.P -.SS Unary logical operators -.TP -.B ! -Logical negation -.P -.SS Grouping operators -.sp -.PD 0 -.TP -.B ( -Left parenthesis -.TP -.B ) -Right parenthesis -.TP -.B [ -List start -.TP -.B ] -List end -.TP -.B { -List subset start -.TP -.B } -List subset end -.PD -.SS Informal grammar specification -.HP -.BR STATEMENT " = " column " cmp_op " VALUE " | " \%STATEMENT " log_op " STATEMENT " | " \%(STATEMENT) " | " \%!(STATEMENT) -.br -.HP -.BR VALUE " = " [VALUE " log_op " VALUE] -.br -For list-based types: string list. Matches strictly. -The log_op must always be of one type within the whole list value. -.HP -.BR VALUE " = " {VALUE " log_op " VALUE} -.br -For list-based types: string list. Matches a subset. -The log_op must always be of one type within the whole list value. -.HP -.BR VALUE " = " value -.br -For scalar types: number (integer), size (floating point number -with size unit suffix), percent (floating point number with or -without % suffix), string. -. .SH DIAGNOSTICS . All tools return a status code of zero on success or non-zero on failure. @@ -835,6 +733,7 @@ directly. .nh .BR lvm.conf (5), .BR lvmcache (7), +.BR lvmreport(7), .BR lvmthin (7), .BR clvmd (8), .BR dmsetup (8),

1 0

master - lvmdbusd: Remove extraneous finally
by tasleson 17 Nov '16

17 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0bbf63134974b850… Commit: 0bbf63134974b85096a7949558f5546204a2a135 Parent: 3b4c5a2151a3a121123a0e4d5b9fd20344979a23 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 17 13:59:39 2016 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 17 13:59:39 2016 -0600 lvmdbusd: Remove extraneous finally The print statement is incorrect. --- daemons/lvmdbusd/lvm_shell_proxy.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py index 4ab42c5..8d15e10 100755 --- a/daemons/lvmdbusd/lvm_shell_proxy.py +++ b/daemons/lvmdbusd/lvm_shell_proxy.py @@ -274,5 +274,3 @@ if __name__ == "__main__": pass except Exception: traceback.print_exc(file=sys.stdout) - finally: - print()

1 0

master - lvmdbusd: Fix source documentation
by tasleson 17 Nov '16

17 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3b4c5a2151a3a121… Commit: 3b4c5a2151a3a121123a0e4d5b9fd20344979a23 Parent: 3a6c78e22aa958254f7ff993329cac3d7202d290 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 17 13:58:17 2016 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 17 13:58:17 2016 -0600 lvmdbusd: Fix source documentation --- daemons/lvmdbusd/manager.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/daemons/lvmdbusd/manager.py b/daemons/lvmdbusd/manager.py index bdb08f6..3f6f09b 100644 --- a/daemons/lvmdbusd/manager.py +++ b/daemons/lvmdbusd/manager.py @@ -170,6 +170,8 @@ class Manager(AutomatedProperties): """ Allow the client to enable/disable lvm shell, used for testing :param yes_no: + :param cb: dbus python call back parameter, not client visible + :param cbe: dbus python error call back parameter, not client visible :return: Nothing """ r = RequestEntry(-1, Manager._use_lvm_shell, (yes_no,), cb, cbe, False)

1 0

master - lvmdbusd: cmdhandler.py, fix imports
by tasleson 17 Nov '16

17 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3a6c78e22aa95825… Commit: 3a6c78e22aa958254f7ff993329cac3d7202d290 Parent: 19a0bf9df61d2ad58cc1be70cf6132b57cb49c85 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 17 13:57:44 2016 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 17 13:57:44 2016 -0600 lvmdbusd: cmdhandler.py, fix imports Use the correct py3 syntax for handling imports. Also use print instead of log_debug which in this context will produce no output. --- daemons/lvmdbusd/cmdhandler.py | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/daemons/lvmdbusd/cmdhandler.py b/daemons/lvmdbusd/cmdhandler.py index dff91ad..1d5ff4a 100644 --- a/daemons/lvmdbusd/cmdhandler.py +++ b/daemons/lvmdbusd/cmdhandler.py @@ -15,14 +15,9 @@ import collections import traceback import os -try: - from . import cfg - from .utils import pv_dest_ranges, log_debug, log_error - from .lvm_shell_proxy import LVMShellProxy -except SystemError: - import cfg - from utils import pv_dest_ranges, log_debug, log_error - from lvm_shell_proxy import LVMShellProxy +from lvmdbusd import cfg +from lvmdbusd.utils import pv_dest_ranges, log_debug, log_error +from lvmdbusd.lvm_shell_proxy import LVMShellProxy try: import simplejson as json @@ -117,6 +112,7 @@ _t_call = call_lvm def _shell_cfg(): global _t_call + # noinspection PyBroadException try: lvm_shell = LVMShellProxy() _t_call = lvm_shell.call_lvm @@ -750,4 +746,4 @@ if __name__ == '__main__': pv_data = pv_retrieve_with_segs() for p in pv_data: - log_debug(str(p)) + print(str(p))

1 0

master - lvmdbusd: Remove debug JSON file
by tasleson 17 Nov '16

17 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=19a0bf9df61d2ad5… Commit: 19a0bf9df61d2ad58cc1be70cf6132b57cb49c85 Parent: bd47b202fb373a93761e038afe39fb6aeee89289 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 17 11:45:11 2016 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 17 11:45:11 2016 -0600 lvmdbusd: Remove debug JSON file --- daemons/lvmdbusd/lvm_shell_proxy.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py index 193c844..4ab42c5 100755 --- a/daemons/lvmdbusd/lvm_shell_proxy.py +++ b/daemons/lvmdbusd/lvm_shell_proxy.py @@ -229,10 +229,6 @@ class LVMShellProxy(object): else: error_msg = self.get_error_msg() except ValueError: - # The json is bad?, lets dump out for debug - with open('/tmp/json_bad', 'w') as debug: - debug.write(report) - # Bubble up the invalid json. error_msg = "Invalid json %s" % report

1 0

master - lvmdbustest: Reduce dbus object churn
by tasleson 17 Nov '16

17 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bd47b202fb373a93… Commit: bd47b202fb373a93761e038afe39fb6aeee89289 Parent: bfedeb748149c61caab44957c0a4f54fe57d6823 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 17 10:34:07 2016 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 17 11:35:16 2016 -0600 lvmdbustest: Reduce dbus object churn Instead of creating a new dbus object each time we get an interface object we will use the same one. --- test/dbus/testlib.py | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/test/dbus/testlib.py b/test/dbus/testlib.py index e0c26a8..89e73d2 100644 --- a/test/dbus/testlib.py +++ b/test/dbus/testlib.py @@ -167,9 +167,7 @@ class RemoteInterface(object): if not props: for _ in range(0, 3): try: - prop_obj = self.bus.get_object( - BUS_NAME, self.object_path, introspect=False) - prop_interface = dbus.Interface(prop_obj, + prop_interface = dbus.Interface(self.dbus_object, 'org.freedesktop.DBus.Properties') props = prop_interface.GetAll(self.interface) break @@ -184,29 +182,28 @@ class RemoteInterface(object): ['properties'][kl]['p_type']) setattr(self, kl, vl) + @property + def object_path(self): + return self.dbus_object.object_path + def __init__( - self, specified_bus, object_path, interface, introspect, + self, dbus_object, interface, introspect, properties=None): - self.object_path = object_path + self.dbus_object = dbus_object self.interface = interface - self.bus = specified_bus self.introspect = introspect - self.dbus_method = dbus.Interface(specified_bus.get_object( - BUS_NAME, self.object_path, introspect=False), self.interface) - + self.dbus_interface = dbus.Interface(self.dbus_object, self.interface) self._set_props(properties) def __getattr__(self, item): - if hasattr(self.dbus_method, item): + if hasattr(self.dbus_interface, item): return functools.partial(self._wrapper, item) else: return functools.partial(self, item) def _wrapper(self, _method_name, *args, **kwargs): - result = getattr(self.dbus_method, _method_name)(*args, **kwargs) - # print("DEBUG: %s.%s result %s" % - # (self.interface, _method_name, str(type(result)))) + result = getattr(self.dbus_interface, _method_name)(*args, **kwargs) if self.introspect: if 'RETURN_VALUE' in self.introspect[ @@ -229,24 +226,25 @@ class ClientProxy(object): return nm.split('.')[-1:][0] def get_introspect(self): - i = dbus.Interface(self.bus.get_object( - BUS_NAME, self.object_path, introspect=False), - 'org.freedesktop.DBus.Introspectable') + i = dbus.Interface( + self.dbus_object, + 'org.freedesktop.DBus.Introspectable') return DbusIntrospection.introspect(i.Introspect()) def _common(self, interface, introspect, properties): short_name = ClientProxy._intf_short_name(interface) self.short_interface_names.append(short_name) - ro = RemoteInterface(self.bus, self.object_path, interface, introspect, + ro = RemoteInterface(self.dbus_object, interface, introspect, properties) setattr(self, short_name, ro) - def __init__(self, specified_bus, object_path, interface_prop_hash=None, + def __init__(self, bus, object_path, interface_prop_hash=None, interfaces=None): self.object_path = object_path self.short_interface_names = [] - self.bus = specified_bus + self.dbus_object = bus.get_object( + BUS_NAME, self.object_path, introspect=False) if interface_prop_hash: assert interfaces is None @@ -267,6 +265,11 @@ class ClientProxy(object): # will also utilize it to verify what we get back verifies introspect = self.get_introspect() + if interface_prop_hash: + introspect_interfaces = list(introspect.keys()) + for object_manager_key in interface_prop_hash.keys(): + assert object_manager_key in introspect_interfaces + for i in list(introspect.keys()): self._common(i, introspect, None)

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2016