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

libdm: thin status update

Browse Source 
Fix parsing of 'Fail' status (using capital letter) for thin-pool.
Add also parsing of 'Error' state for thin-pool.
Add needs_check test for thin-pool.

Detect Fail state for thin.
This commit is contained in:
Zdenek Kabelac 2016-02-15 16:33:38 +01:00
parent ecfa465366
commit 0fb3669d49
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.117 - Version 1.02.117 -
===================================== =====================================
Improve status parsing for thin-pool and thin devices.
Version 1.02.116 - 15th February 2016 Version 1.02.116 - 15th February 2016
===================================== =====================================

8
libdm/libdevmapper.h
View File

@ -406,8 +406,10 @@ struct dm_status_thin_pool {
dm_thin_discards_t discards; dm_thin_discards_t discards;
uint32_t fail : 1; /* all I/O fails */ uint32_t fail : 1; /* all I/O fails */
uint32_t error_if_no_space : 1; /* otherwise queue_if_no_space */ uint32_t error_if_no_space : 1; /* otherwise queue_if_no_space */
uint32_t out_of_data_space : 1; /* metadata may be changed, but data may not be allocated */ uint32_t out_of_data_space : 1; /* metadata may be changed, but data may not be allocated (no rw) */
uint32_t reserved : 29; uint32_t needs_check : 1; /* metadata needs check */
uint32_t error : 1; /* detected error (switches to fail soon) */
uint32_t reserved : 27;
}; };
int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, int dm_get_status_thin_pool(struct dm_pool *mem, const char *params,
@ -417,6 +419,8 @@ int dm_get_status_thin_pool(struct dm_pool *mem, const char *params,
struct dm_status_thin { struct dm_status_thin {
uint64_t mapped_sectors; uint64_t mapped_sectors;
uint64_t highest_mapped_sector; uint64_t highest_mapped_sector;
uint32_t fail : 1; /* Thin volume fails I/O */
uint32_t reserved : 31;
}; };
int dm_get_status_thin(struct dm_pool *mem, const char *params, int dm_get_status_thin(struct dm_pool *mem, const char *params,

29
libdm/libdm-targets.c
View File

@ -278,6 +278,17 @@ int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s)
return 0; return 0;
} }
if (strstr(params, "Error")) {
s->error = 1;
s->fail = 1; /* This is also I/O fail state */
return 1;
}
if (strstr(params, "Fail")) {
s->fail = 1;
return 1;
}
/* FIXME: add support for held metadata root */ /* FIXME: add support for held metadata root */
if (sscanf(params, FMTu64 " " FMTu64 "/" FMTu64 " " FMTu64 "/" FMTu64 "%n", if (sscanf(params, FMTu64 " " FMTu64 "/" FMTu64 " " FMTu64 "/" FMTu64 "%n",
&s->transaction_id, &s->transaction_id,
@ -297,16 +308,19 @@ int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s)
else /* default discard_passdown */ else /* default discard_passdown */
s->discards = DM_THIN_DISCARDS_PASSDOWN; s->discards = DM_THIN_DISCARDS_PASSDOWN;
if (strstr(params + pos, "ro ")) /* Default is 'writable' (rw) data */
s->read_only = 1; if (strstr(params + pos, "out_of_data_space"))
else if (strstr(params + pos, "fail"))
s->fail = 1;
else if (strstr(params + pos, "out_of_data_space"))
s->out_of_data_space = 1; s->out_of_data_space = 1;
else if (strstr(params + pos, "ro "))
s->read_only = 1;
/* Default is 'queue_if_no_space' */
if (strstr(params + pos, "error_if_no_space")) if (strstr(params + pos, "error_if_no_space"))
s->error_if_no_space = 1; s->error_if_no_space = 1;
if (strstr(params + pos, "needs_check"))
s->needs_check = 1;
return 1; return 1;
} }
@ -341,8 +355,9 @@ int dm_get_status_thin(struct dm_pool *mem, const char *params,
} }
if (strchr(params, '-')) { if (strchr(params, '-')) {
s->mapped_sectors = 0; /* nothing to parse */
s->highest_mapped_sector = 0; } else if (strstr(params, "Fail")) {
s->fail = 1;
} else if (sscanf(params, FMTu64 " " FMTu64, } else if (sscanf(params, FMTu64 " " FMTu64,
&s->mapped_sectors, &s->mapped_sectors,
&s->highest_mapped_sector) != 2) { &s->highest_mapped_sector) != 2) {