diff options
| author | Tony Asleson <tasleson@redhat.com> | 2016-10-11 09:36:47 -0500 |
|---|---|---|
| committer | Tony Asleson <tasleson@redhat.com> | 2016-10-11 13:16:57 -0500 |
| commit | 2830f722882d064a6ffbe143f5a580364bcba2e6 (patch) | |
| tree | 1c22b9cfd643724f7ec2080cfb47e59988651282 | |
| parent | fe437a6e7d9367eecd977d2504db82469016c780 (diff) | |
| download | lvm2-2830f722882d064a6ffbe143f5a580364bcba2e6.tar.gz | |
lvmdbusd: Disable lvm abort on too much log output
The commit:
https://git.fedorahosted.org/cgit/lvm2.git/commit/?id=34c55d98eefd88f85476c0f62f0649c706bde6f0
introduced an abort if lvm logs too much. In the case of utilizing
lvm shell this is a pretty normal occurance, so we will disable
when we use lvm shell.
| -rwxr-xr-x | daemons/lvmdbusd/lvm_shell_proxy.py | 4 | ||||
| -rw-r--r-- | test/api/dbustest.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py index 6e6d52aab..9edf3368c 100755 --- a/daemons/lvmdbusd/lvm_shell_proxy.py +++ b/daemons/lvmdbusd/lvm_shell_proxy.py @@ -121,6 +121,10 @@ class LVMShellProxy(object): local_env["LVM_REPORT_FD"] = "32" local_env["LVM_COMMAND_PROFILE"] = "lvmdbusd" + # Disable the abort logic if lvm logs too much, which easily happens + # when utilizing the lvm shell. + local_env["LVM_LOG_FILE_MAX_LINES"] = "0" + flags = fcntl(self.report_r, F_GETFL) fcntl(self.report_r, F_SETFL, flags | os.O_NONBLOCK) diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh index 16dc186b8..5ffe967c6 100644 --- a/test/api/dbustest.sh +++ b/test/api/dbustest.sh @@ -29,8 +29,4 @@ export LVM_BINARY=$TESTOLDPWD/../tools/lvm aux prepare_lvmdbusd -# Lets limit testing until the lvm SIGABRT is fixed as -# we are running into that when using the lvm shell -export LVM_DBUS_TEST_SHELL=0 - $test_data_dir/dbus/lvmdbustest.py -v |