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

Add --unquoted to reporting tools.

This commit is contained in:
Alasdair Kergon 2008-06-24 21:21:04 +00:00
parent f1839ac87c
commit 30ef4c738a
7 changed files with 32 additions and 19 deletions

View File

@ -1,17 +1,15 @@
Version 2.02.39 - Version 2.02.39 -
================================ ================================
Suppress invalid 'sb_offset' compiler warning with uninitialzed_var(). Add --unquoted to reporting tools.
Add uninitialzed_var() macro to suppress invalid compiler warnings. Add and use uninitialized_var() macro to suppress invalid compiler warnings.
Suppress 'sb_offset' compiler warning by using enum for md minor sb version. Introduce enum for md minor sb version to suppress compiler warning.
lvm2_run: Don't return uninitialized "ret" for _memlock_inc or _memlock_dec. Avoid undefined return value after _memlock manipulation in lvm2_run.
Avoid link failure when configuring without --enable-cmdlib. Avoid link failure if configured without --enable-cmdlib or --enable-readline.
Avoid link failure when configuring without --enable-readline. Make clvmd return at once if other nodes down in a gulm or openais cluster.
Make clvmd return immediately if other nodes are down in an openais cluster. Fix and improve readahead 'auto' calculation for stripe_size.
Make clvmd return immediately if other nodes are down in a gulm cluster. Fix lvchange output for -r auto setting if auto is already set.
Improve/Fix read ahead 'auto' calculation for stripe_size Add test case for readahead.
Fix lvchange output for -r auto setting if auto is already set Fix ambiguous use of identifier error_message_produced.
Add testcase for read ahead
Fix ambiguous use of identifier 'error_message_produced'.
Begin syncing configure.in for merge/unification with device-mapper. Begin syncing configure.in for merge/unification with device-mapper.
Fix add_mirror_images not to dereference uninitialized log_lv upon failure. Fix add_mirror_images not to dereference uninitialized log_lv upon failure.
Don't call openlog for every debug line output by clvmd. Don't call openlog for every debug line output by clvmd.

View File

@ -103,6 +103,7 @@
#define DEFAULT_REP_BUFFERED 1 #define DEFAULT_REP_BUFFERED 1
#define DEFAULT_REP_HEADINGS 1 #define DEFAULT_REP_HEADINGS 1
#define DEFAULT_REP_PREFIXES 0 #define DEFAULT_REP_PREFIXES 0
#define DEFAULT_REP_QUOTED 1
#define DEFAULT_REP_SEPARATOR " " #define DEFAULT_REP_SEPARATOR " "
#define DEFAULT_LVS_COLS "lv_name,vg_name,lv_attr,lv_size,origin,snap_percent,move_pv,mirror_log,copy_percent,convert_lv" #define DEFAULT_LVS_COLS "lv_name,vg_name,lv_attr,lv_size,origin,snap_percent,move_pv,mirror_log,copy_percent,convert_lv"

View File

@ -1077,7 +1077,8 @@ static struct dm_report_field_type _fields[] = {
void *report_init(struct cmd_context *cmd, const char *format, const char *keys, void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
report_type_t *report_type, const char *separator, report_type_t *report_type, const char *separator,
int aligned, int buffered, int headings, int field_prefixes) int aligned, int buffered, int headings, int field_prefixes,
int quoted)
{ {
uint32_t report_flags = 0; uint32_t report_flags = 0;
void *rh; void *rh;
@ -1094,6 +1095,9 @@ void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
if (field_prefixes) if (field_prefixes)
report_flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX; report_flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX;
if (!quoted)
report_flags |= DM_REPORT_OUTPUT_FIELD_UNQUOTED;
rh = dm_report_init(report_type, _report_types, _fields, format, rh = dm_report_init(report_type, _report_types, _fields, format,
separator, report_flags, keys, cmd); separator, report_flags, keys, cmd);

View File

@ -28,7 +28,8 @@ typedef int (*field_report_fn) (struct report_handle * dh, struct field * field,
void *report_init(struct cmd_context *cmd, const char *format, const char *keys, void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
report_type_t *report_type, const char *separator, report_type_t *report_type, const char *separator,
int aligned, int buffered, int headings, int field_prefixes); int aligned, int buffered, int headings, int field_prefixes,
int quoted);
void report_free(void *handle); void report_free(void *handle);
int report_object(void *handle, struct volume_group *vg, int report_object(void *handle, struct volume_group *vg,
struct logical_volume *lv, struct physical_volume *pv, struct logical_volume *lv, struct physical_volume *pv,

View File

@ -54,6 +54,7 @@ arg(config_ARG, '\0', "config", string_arg, 0)
arg(trustcache_ARG, '\0', "trustcache", NULL, 0) arg(trustcache_ARG, '\0', "trustcache", NULL, 0)
arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0) arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0)
arg(nameprefixes_ARG, '\0', "nameprefixes", NULL, 0) arg(nameprefixes_ARG, '\0', "nameprefixes", NULL, 0)
arg(unquoted_ARG, '\0', "unquoted", NULL, 0)
/* Allow some variations */ /* Allow some variations */
arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0) arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0)

View File

@ -377,6 +377,7 @@ xx(lvs,
"\t[--trustcache]\n" "\t[--trustcache]\n"
"\t[--unbuffered]\n" "\t[--unbuffered]\n"
"\t[--units hsbkmgtHKMGT]\n" "\t[--units hsbkmgtHKMGT]\n"
"\t[--unquoted]\n"
"\t[-v|--verbose]\n" "\t[-v|--verbose]\n"
"\t[--version]" "\n" "\t[--version]" "\n"
"\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n", "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
@ -384,7 +385,7 @@ xx(lvs,
aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG, aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG,
units_ARG) units_ARG, unquoted_ARG)
xx(lvscan, xx(lvscan,
"List all logical volumes in all volume groups", "List all logical volumes in all volume groups",
@ -586,6 +587,7 @@ xx(pvs,
"\t[--trustcache]\n" "\t[--trustcache]\n"
"\t[--unbuffered]\n" "\t[--unbuffered]\n"
"\t[--units hsbkmgtHKMGT]\n" "\t[--units hsbkmgtHKMGT]\n"
"\t[--unquoted]\n"
"\t[-v|--verbose]\n" "\t[-v|--verbose]\n"
"\t[--version]\n" "\t[--version]\n"
"\t[PhysicalVolume [PhysicalVolume...]]\n", "\t[PhysicalVolume [PhysicalVolume...]]\n",
@ -593,7 +595,7 @@ xx(pvs,
aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG, aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG,
units_ARG) units_ARG, unquoted_ARG)
xx(pvscan, xx(pvscan,
"List all physical volumes", "List all physical volumes",
@ -902,13 +904,15 @@ xx(vgs,
"\t[--trustcache]\n" "\t[--trustcache]\n"
"\t[--unbuffered]\n" "\t[--unbuffered]\n"
"\t[--units hsbkmgtHKMGT]\n" "\t[--units hsbkmgtHKMGT]\n"
"\t[--unquoted]\n"
"\t[-v|--verbose]\n" "\t[-v|--verbose]\n"
"\t[--version]\n" "\t[--version]\n"
"\t[VolumeGroupName [VolumeGroupName...]]\n", "\t[VolumeGroupName [VolumeGroupName...]]\n",
aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG, aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG) separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG,
unquoted_ARG)
xx(vgscan, xx(vgscan,
"Search for all volume groups", "Search for all volume groups",

View File

@ -158,7 +158,7 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
char *str; char *str;
const char *keys = NULL, *options = NULL, *separator; const char *keys = NULL, *options = NULL, *separator;
int r = ECMD_PROCESSED; int r = ECMD_PROCESSED;
int aligned, buffered, headings, field_prefixes; int aligned, buffered, headings, field_prefixes, quoted;
unsigned args_are_pvs; unsigned args_are_pvs;
aligned = find_config_tree_int(cmd, "report/aligned", aligned = find_config_tree_int(cmd, "report/aligned",
@ -171,6 +171,8 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
DEFAULT_REP_SEPARATOR); DEFAULT_REP_SEPARATOR);
field_prefixes = find_config_tree_int(cmd, "report/prefixes", field_prefixes = find_config_tree_int(cmd, "report/prefixes",
DEFAULT_REP_PREFIXES); DEFAULT_REP_PREFIXES);
quoted = find_config_tree_int(cmd, "report/quoted",
DEFAULT_REP_QUOTED);
args_are_pvs = (report_type == PVS || report_type == PVSEGS) ? 1 : 0; args_are_pvs = (report_type == PVS || report_type == PVSEGS) ? 1 : 0;
@ -276,10 +278,12 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
aligned = 0; aligned = 0;
field_prefixes = 1; field_prefixes = 1;
} }
if (arg_count(cmd, unquoted_ARG))
quoted = 0;
if (!(report_handle = report_init(cmd, options, keys, &report_type, if (!(report_handle = report_init(cmd, options, keys, &report_type,
separator, aligned, buffered, separator, aligned, buffered,
headings, field_prefixes))) { headings, field_prefixes, quoted))) {
stack; stack;
return ECMD_FAILED; return ECMD_FAILED;
} }