lvm2-commits August 2022

lvm2-commits@lists.fedorahosted.org

4 participants
45 discussions

main - config: add correct unconfigured value for use_devicesfile
by Marian Csontos 09 Aug '22

09 Aug '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2fc52b6c41172fc4ae15e… Commit: 2fc52b6c41172fc4ae15e736fae095aa681ff03a Parent: 4e6ed2c458a47b2ea4b43c4e0b00ec070040a592 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Aug 9 16:04:09 2022 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Aug 9 16:17:45 2022 +0200 config: add correct unconfigured value for use_devicesfile --- conf/example.conf.in | 2 +- lib/config/config_settings.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 4e5482fee..5fadeac12 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -126,7 +126,7 @@ devices { # be used, regardless of this setting, when the --devicesfile # option is set to a specific file name. # This configuration option has an automatic default value. - # use_devicesfile = 0 + # use_devicesfile = @DEFAULT_USE_DEVICES_FILE@ # Configuration option devices/devicesfile. # The name of the system devices file, listing devices that LVM should use. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index e97e12152..d2811df2b 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -277,7 +277,7 @@ cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, C "preferred_names = [ \"^/dev/mpath/\", \"^/dev/mapper/mpath\", \"^/dev/[hs]d\" ]\n" "#\n") -cfg(devices_use_devicesfile_CFG, "use_devicesfile", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_DEVICES_FILE, vsn(2, 3, 12), NULL, 0, NULL, +cfg(devices_use_devicesfile_CFG, "use_devicesfile", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_DEVICES_FILE, vsn(2, 3, 12), "@DEFAULT_USE_DEVICES_FILE@", 0, NULL, "Enable or disable the use of a devices file.\n" "When enabled, lvm will only use devices that\n" "are lised in the devices file. A devices file will\n"

1 0

main - spec: use --with-default-use-devices-file=1 for rhel9+
by Marian Csontos 09 Aug '22

09 Aug '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4e6ed2c458a47b2ea4b43… Commit: 4e6ed2c458a47b2ea4b43c4e0b00ec070040a592 Parent: 31f9c4bfab4d859369b0a5365fda44e398a4656b Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Aug 9 16:02:39 2022 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Aug 9 16:17:43 2022 +0200 spec: use --with-default-use-devices-file=1 for rhel9+ --- spec/source.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/source.inc b/spec/source.inc index 3e7573025..7b44ef152 100644 --- a/spec/source.inc +++ b/spec/source.inc @@ -121,6 +121,10 @@ %with thin_dump %endif +%if %{rhel} >= 9 +%with default-use-devices-file 1 +%endif + ############################################################## %if %{fedora} == 17

1 0

main - configure: fix typo
by Marian Csontos 09 Aug '22

09 Aug '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=31f9c4bfab4d859369b0a… Commit: 31f9c4bfab4d859369b0a5365fda44e398a4656b Parent: 9cdd258646d5d9da534568a61133e76f3d5548d7 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Aug 9 16:01:34 2022 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Aug 9 16:17:40 2022 +0200 configure: fix typo --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6cdf1a7e6..ba02f1f9b 100644 --- a/configure.ac +++ b/configure.ac @@ -293,7 +293,7 @@ case "$DEFAULT_USE_DEVICES_FILE" in esac AC_MSG_RESULT($DEFAULT_USE_DEVICES_FILE) AC_DEFINE_UNQUOTED(DEFAULT_USE_DEVICES_FILE, [$DEFAULT_USE_DEVICES_FILE], - [Default for lvm.conf use_devicefile.]) + [Default for lvm.conf use_devicesfile.]) AC_MSG_CHECKING(default name mangling) AC_ARG_WITH(default-name-mangling,

1 0

main - spec: Use libedit for newer distributions
by Marian Csontos 09 Aug '22

09 Aug '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9cdd258646d5d9da53456… Commit: 9cdd258646d5d9da534568a61133e76f3d5548d7 Parent: 2fa99164938d11221fe6afc30af4f016bbc02450 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Wed Jul 27 18:02:01 2022 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Aug 9 16:17:36 2022 +0200 spec: Use libedit for newer distributions --- spec/build.inc | 2 ++ spec/source.inc | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/spec/build.inc b/spec/build.inc index 8067e58d0..e57ecf958 100644 --- a/spec/build.inc +++ b/spec/build.inc @@ -28,6 +28,8 @@ %enableif %{enable_dbusd} dbus-service %enableif %{enable_dbusd} notify-dbus %enableif %{enable_dmfilemapd} dmfilemapd +%enableif %{enable_readline} readline +%enableif %{enable_editline} editline %build diff --git a/spec/source.inc b/spec/source.inc index d608debab..3e7573025 100644 --- a/spec/source.inc +++ b/spec/source.inc @@ -47,6 +47,14 @@ %global req_udev udev >= 181-1 +%if %{fedora} >= 35 || %{rhel} >= 9 + %global enable_readline 0 + %global enable_editline 1 +%else + %global enable_readline 1 + %global enable_editline 0 +%endif + %if %{fedora} >= 24 || %{rhel} >= 7 %service lvmlockd 1 %global sanlock_version 3.3.0-1 @@ -154,7 +162,12 @@ Source94: macros.inc BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel +%if %{enable_readline} BuildRequires: readline-devel +%endif +%if %{enable_editline} +BuildRequires: libedit-devel +%endif BuildRequires: module-init-tools BuildRequires: pkgconfig

1 0

master - shell: also output error message about max number of args hit with JSON format
by Peter Rajnoha 08 Aug '22

08 Aug '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2fa99164938d11221fe6a… Commit: 2fa99164938d11221fe6afc30af4f016bbc02450 Parent: 99ce09ae778c2cc4aa2611e425bba5287b8b9513 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Aug 8 15:15:32 2022 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Aug 8 15:46:52 2022 +0200 shell: also output error message about max number of args hit with JSON format If using JSON format for lvm shell's output, the error message about exceeding the maximum number of arguments was not reported on output if this condition was ever hit. This is because the JSON format (as well as any other future format) requires extra formatting compared to "basic" format and so it also requires extra calls when it comes to reporting. The report needs to be added to a report group and then popped and put on output with specialized "dm_report_group_output_and_pop_all". This "output and pop" is normally executed after we execute the command in the lvm shell. When we didn't get to the command exection at all because some precondition was not met (like hitting the limit for the number of arguments for the command here), we skipped this important call and so there was no log report output. Right now, it's only this exact error message for which we need to call "output and pop" directly, all the other error messages are about initializing and setting the log report itself which we can't report obviously. Before this patch: lvm> pvs 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 lvm> With this patch applied: lvm> pvs 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 { "log": [ {"log_seq_num":"1", "log_type":"error", "log_context":"shell", "log_object_type":"cmd", "log_object_name":"", "log_object_id":"", "log_object_group":"", "log_object_group_id":"", "log_message":"Too many arguments, sorry.", "log_errno":"-1", "log_ret_code":"0"} ] } If there's any other error message in the future before we execute the command itself, we also need to call the "output and pop" directly. --- tools/lvm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/lvm.c b/tools/lvm.c index e80113e0d..756328f3f 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -234,6 +234,16 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_CMD); while (1) { + /* + * Note: If we need to output the log report before we get to the dm_report_group_output_and_pop_all + * at the end of this loop, like hitting a failure situation before we execute the command itself, + * don't forget to directly call dm_report_group_output_and_pop_all, otherwise no log meesage will + * appear on output (for output formats other than 'basic'). + * + * Obviously, you can't output the 'log report' if the error is in initializing or setting + * the report itself. In this case, we can only return an error code, but no message. + */ + report_reset_cmdlog_seqnum(); if (cmd->cmd_report.log_rh) { /* @@ -275,6 +285,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) if (lvm_split(input, &argc, argv, MAX_ARGS) == MAX_ARGS) { _discard_log_report_content(cmd); log_error("Too many arguments, sorry."); + dm_report_group_output_and_pop_all(cmd->cmd_report.report_group); continue; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2022