shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

lvmdbusd: Don't require "lvm> " prompt for shell

Browse Source 
Depending on how lvm is compiled, it may not present the "lvm> " prompt
when using the lvm shell.  Don't require it to be present.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2090391
This commit is contained in:
Tony Asleson 2022-06-06 09:56:32 -05:00
parent eee89a941e
commit 6914942685
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
daemons/lvmdbusd/lvm_shell_proxy.py.in
View File

@ -19,7 +19,6 @@ import sys
import tempfile import tempfile
import time import time
import select import select
import copy
try: try:
import simplejson as json import simplejson as json
@ -31,8 +30,6 @@ from lvmdbusd.cfg import LVM_CMD
from lvmdbusd.utils import log_debug, log_error, add_no_notify, make_non_block,\ from lvmdbusd.utils import log_debug, log_error, add_no_notify, make_non_block,\
read_decoded read_decoded
SHELL_PROMPT = "lvm> "
def _quote_arg(arg): def _quote_arg(arg):
if len(shlex.split(arg)) > 1: if len(shlex.split(arg)) > 1:
@ -43,10 +40,11 @@ def _quote_arg(arg):
class LVMShellProxy(object): class LVMShellProxy(object):
# Read until we get prompt back and a result # Read REPORT FD until we have a complete and valid JSON record or give
# @param: no_output Caller expects no output to report FD # up trying to get one.
# Returns stdout, report, stderr (report is JSON!) #
def _read_until_prompt(self, no_output=False): # Returns stdout, report (JSON), stderr
def _read_response(self):
stdout = "" stdout = ""
report = "" report = ""
stderr = "" stderr = ""
@ -58,6 +56,7 @@ class LVMShellProxy(object):
# Try reading from all FDs to prevent one from filling up and causing # Try reading from all FDs to prevent one from filling up and causing
# a hang. Keep reading until we get the prompt back and the report # a hang. Keep reading until we get the prompt back and the report
# FD does not contain valid JSON # FD does not contain valid JSON
while keep_reading: while keep_reading:
try: try:
rd_fd = [ rd_fd = [
@ -78,15 +77,13 @@ class LVMShellProxy(object):
if self.lvm_shell.poll() is not None: if self.lvm_shell.poll() is not None:
raise Exception(self.lvm_shell.returncode, "%s" % stderr) raise Exception(self.lvm_shell.returncode, "%s" % stderr)
if stdout.endswith(SHELL_PROMPT):
if no_output:
keep_reading = False
else:
cur_report_len = len(report) cur_report_len = len(report)
if cur_report_len != 0: if cur_report_len != 0:
# Only bother to parse if we have more data # Only bother to parse if we have more data and the last 2 characters match expected
if prev_report_len != cur_report_len: # complete JSON, prevents excessive JSON parsing attempts
if prev_report_len != cur_report_len and report[-2:] == "}\n":
prev_report_len = cur_report_len prev_report_len = cur_report_len
# Parse the JSON if it's good we are done, # Parse the JSON if it's good we are done,
# if not we will try to read some more. # if not we will try to read some more.
try: try:
@ -95,7 +92,10 @@ class LVMShellProxy(object):
except ValueError: except ValueError:
pass pass
if keep_reading: # As long as lvm is spewing something on one of the FDs we will
# keep trying. If we get a few timeouts with no activity, and
# we don't have valid JSON, we will raise an error.
if len(ready) == 0 and keep_reading:
extra_passes -= 1 extra_passes -= 1
if extra_passes <= 0: if extra_passes <= 0:
if len(report): if len(report):
@ -118,7 +118,6 @@ class LVMShellProxy(object):
self.lvm_shell.stdin.flush() self.lvm_shell.stdin.flush()
def __init__(self): def __init__(self):
# Create a temp directory # Create a temp directory
tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_") tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_")
tmp_file = "%s/lvmdbus_report" % (tmp_dir) tmp_file = "%s/lvmdbus_report" % (tmp_dir)
@ -139,6 +138,11 @@ class LVMShellProxy(object):
local_env = {"LC_ALL": "C", "LVM_REPORT_FD": "%s" % lvm_fd, "LVM_COMMAND_PROFILE": "lvmdbusd", local_env = {"LC_ALL": "C", "LVM_REPORT_FD": "%s" % lvm_fd, "LVM_COMMAND_PROFILE": "lvmdbusd",
"LVM_LOG_FILE_MAX_LINES": "0"} "LVM_LOG_FILE_MAX_LINES": "0"}
# If any env variables contain LVM we will propagate them too
for k, v in os.environ.items():
if "LVM" in k:
local_env[k] = v
# run the lvm shell # run the lvm shell
self.lvm_shell = subprocess.Popen( self.lvm_shell = subprocess.Popen(
[LVM_CMD], [LVM_CMD],
@ -152,10 +156,9 @@ class LVMShellProxy(object):
# Close our copy of the lvm_fd, child process is open in its process space # Close our copy of the lvm_fd, child process is open in its process space
os.close(lvm_fd) os.close(lvm_fd)
# wait for the first prompt # Assume we are ready as we may not get the lvm prompt message depending on
errors = self._read_until_prompt(no_output=True)[2] # if we are using readline or editline.
if errors and len(errors):
raise RuntimeError(errors)
except: except:
raise raise
finally: finally:
@ -169,7 +172,7 @@ class LVMShellProxy(object):
self._write_cmd('lastlog\n') self._write_cmd('lastlog\n')
# read everything from the STDOUT to the next prompt # read everything from the STDOUT to the next prompt
stdout, report_json, stderr = self._read_until_prompt() stdout, report_json, stderr = self._read_response()
if 'log' in report_json: if 'log' in report_json:
error_msg = "" error_msg = ""
# Walk the entire log array and build an error string # Walk the entire log array and build an error string
@ -203,7 +206,7 @@ class LVMShellProxy(object):
self._write_cmd(cmd) self._write_cmd(cmd)
# read everything from the STDOUT to the next prompt # read everything from the STDOUT to the next prompt
stdout, report_json, stderr = self._read_until_prompt() stdout, report_json, stderr = self._read_response()
# Parse the report to see what happened # Parse the report to see what happened
if 'log' in report_json: if 'log' in report_json: