shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Revert "lvdisplay: dispaly correct status when underlying devs missing"

Browse Source 
This reverts commit 1d0dc74f91.

We should avoid adding anything new to lvdisplay and report
new information via lvs reporting fields.
This commit is contained in:
David Teigland 2020-08-28 13:26:50 -05:00
parent 1d0dc74f91
commit 9a88a9c4ce
3 changed files with 3 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/display/display.c
View File

@ -399,7 +399,7 @@ int lvdisplay_full(struct cmd_context *cmd,
void *handle __attribute__((unused))) void *handle __attribute__((unused)))
{ {
struct lvinfo info; struct lvinfo info;
int inkernel, snap_active = 0, partial = 0, raid_is_avail = 1; int inkernel, snap_active = 0;
char uuid[64] __attribute__((aligned(8))); char uuid[64] __attribute__((aligned(8)));
const char *access_str; const char *access_str;
struct lv_segment *snap_seg = NULL, *mirror_seg = NULL; struct lv_segment *snap_seg = NULL, *mirror_seg = NULL;
@ -553,18 +553,11 @@ int lvdisplay_full(struct cmd_context *cmd,
log_print("LV VDO Pool name %s", seg_lv(seg, 0)->name); log_print("LV VDO Pool name %s", seg_lv(seg, 0)->name);
} }
if (lv_is_partial(lv)) {
partial = 1;
if (lv_is_raid(lv))
raid_is_avail = raid_is_available(lv) ? 1 : 0;
}
if (inkernel && info.suspended) if (inkernel && info.suspended)
log_print("LV Status suspended"); log_print("LV Status suspended");
else if (activation()) else if (activation())
log_print("LV Status %savailable %s", log_print("LV Status %savailable",
(inkernel && raid_is_avail) ? "" : "NOT ", inkernel ? "" : "NOT ");
partial ? "(partial)" : "");
/********* FIXME lv_number /********* FIXME lv_number
log_print("LV # %u", lv->lv_number + 1); log_print("LV # %u", lv->lv_number + 1);

1
lib/metadata/segtype.h
View File

@ -326,7 +326,6 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd,
#ifdef RAID_INTERNAL #ifdef RAID_INTERNAL
int init_raid_segtypes(struct cmd_context *cmd, struct segtype_library *seglib); int init_raid_segtypes(struct cmd_context *cmd, struct segtype_library *seglib);
bool raid_is_available(const struct logical_volume *lv);
#endif #endif
#define THIN_FEATURE_DISCARDS (1U << 0) #define THIN_FEATURE_DISCARDS (1U << 0)

54
lib/raid/raid.c
View File

@ -25,60 +25,6 @@
#include "lib/metadata/metadata.h" #include "lib/metadata/metadata.h"
#include "lib/metadata/lv_alloc.h" #include "lib/metadata/lv_alloc.h"
/*
* below case think as available, return true:
* - raid 1: at least 1 disk live
* - raid 10: loose 1 disk
* - raid 4/5: loose 1 disk
* - raid 6: loose 2 disk
*
* raid 0: if there is any disk loose, return false
* */
bool raid_is_available(const struct logical_volume *lv)
{
int s, missing_pv = 0, exist_pv = 0;
bool ret = true;
struct lv_segment *seg = NULL;
dm_list_iterate_items(seg, &lv->segments) {
for (s = 0; s < seg->area_count; ++s) {
if (seg_type(seg, s) == AREA_LV) {
if (seg_lv(seg, s)->status & PARTIAL_LV)
missing_pv++;
else
exist_pv++;
}
}
}
if (seg_is_any_raid0(first_seg(lv))){
ret = missing_pv ? false : true;
goto out;
}
if (seg_is_raid1(first_seg(lv))){
ret = exist_pv ? true : false;
goto out;
}
if (seg_is_any_raid10(first_seg(lv))) {
ret = (missing_pv > 1) ? false : true;
goto out;
}
if (seg_is_raid4(first_seg(lv))) {
ret = (missing_pv > 1) ? false : true;
goto out;
}
if (seg_is_any_raid5(first_seg(lv))) {
ret = (missing_pv > 1) ? false : true;
goto out;
}
if (seg_is_any_raid6(first_seg(lv))) {
ret = (missing_pv > 2) ? false : true;
goto out;
}
out:
return ret;
}
static int _raid_target_present(struct cmd_context *cmd, static int _raid_target_present(struct cmd_context *cmd,
const struct lv_segment *seg __attribute__((unused)), const struct lv_segment *seg __attribute__((unused)),
unsigned *attributes); unsigned *attributes);