December 2017 - lvm2-commits - Fedora mailing-lists

master - lvmdbusd: All tools use detected python3
by Marian Csontos 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7272fd221096dbfd07e7a… Commit: 7272fd221096dbfd07e7ad11f0c938b453de2904 Parent: 2f4c2a43d49d90875ea31b1507cd0dfcdb049e88 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Dec 12 13:10:51 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Dec 12 13:17:07 2017 +0100 lvmdbusd: All tools use detected python3 - lvmdb.py and lvm_shell_proxy.py can be used as standalone tools, so should use detected value. - clean executable bit on *.in files. --- configure | 4 +- configure.in | 2 + daemons/lvmdbusd/.gitignore | 2 + daemons/lvmdbusd/lvm_shell_proxy.py | 269 ---------------- daemons/lvmdbusd/lvm_shell_proxy.py.in | 269 ++++++++++++++++ daemons/lvmdbusd/lvmdb.py | 540 -------------------------------- daemons/lvmdbusd/lvmdb.py.in | 540 ++++++++++++++++++++++++++++++++ 7 files changed, 816 insertions(+), 810 deletions(-) diff --git a/configure b/configure index 7e2969a..d04b9d3 100755 --- a/configure +++ b/configure @@ -15778,7 +15778,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaem on/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service script s/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/ Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_h at.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16489,6 +16489,8 @@ do "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; + "daemons/lvmdbusd/lvmdb.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdb.py" ;; + "daemons/lvmdbusd/lvm_shell_proxy.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvm_shell_proxy.py" ;; "daemons/lvmdbusd/path.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/path.py" ;; "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;; "daemons/lvmpolld/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmpolld/Makefile" ;; diff --git a/configure.in b/configure.in index 88ee5ad..d879408 100644 --- a/configure.in +++ b/configure.in @@ -2187,6 +2187,8 @@ daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd +daemons/lvmdbusd/lvmdb.py +daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile diff --git a/daemons/lvmdbusd/.gitignore b/daemons/lvmdbusd/.gitignore index c0f6b4e..a5a5dd3 100644 --- a/daemons/lvmdbusd/.gitignore +++ b/daemons/lvmdbusd/.gitignore @@ -1,2 +1,4 @@ path.py lvmdbusd +lvmdb.py +lvm_shell_proxy.py diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py deleted file mode 100755 index a26dd70..0000000 --- a/daemons/lvmdbusd/lvm_shell_proxy.py +++ /dev/null @@ -1,269 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Copyright 2015-2016, Vratislav Podzimek <vpodzime(a)redhat.com> - -import subprocess -import shlex -from fcntl import fcntl, F_GETFL, F_SETFL -import os -import traceback -import sys -import tempfile -import time -import select -import copy - -try: - import simplejson as json -except ImportError: - import json - - -from lvmdbusd.cfg import LVM_CMD -from lvmdbusd.utils import log_debug, log_error, add_no_notify - -SHELL_PROMPT = "lvm> " - - -def _quote_arg(arg): - if len(shlex.split(arg)) > 1: - return '"%s"' % arg - else: - return arg - - -class LVMShellProxy(object): - - @staticmethod - def _read(stream): - tmp = stream.read() - if tmp: - return tmp.decode("utf-8") - return '' - - # Read until we get prompt back and a result - # @param: no_output Caller expects no output to report FD - # Returns stdout, report, stderr (report is JSON!) - def _read_until_prompt(self, no_output=False): - stdout = "" - report = "" - stderr = "" - keep_reading = True - extra_passes = 3 - report_json = {} - prev_report_len = 0 - - # 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 - # FD does not contain valid JSON - while keep_reading: - try: - rd_fd = [ - self.lvm_shell.stdout.fileno(), - self.report_stream.fileno(), - self.lvm_shell.stderr.fileno()] - ready = select.select(rd_fd, [], [], 2) - - for r in ready[0]: - if r == self.lvm_shell.stdout.fileno(): - stdout += LVMShellProxy._read(self.lvm_shell.stdout) - elif r == self.report_stream.fileno(): - report += LVMShellProxy._read(self.report_stream) - elif r == self.lvm_shell.stderr.fileno(): - stderr += LVMShellProxy._read(self.lvm_shell.stderr) - - # Check to see if the lvm process died on us - if self.lvm_shell.poll(): - 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) - if cur_report_len != 0: - # Only bother to parse if we have more data - if prev_report_len != cur_report_len: - prev_report_len = cur_report_len - # Parse the JSON if it's good we are done, - # if not we will try to read some more. - try: - report_json = json.loads(report) - keep_reading = False - except ValueError: - pass - - if keep_reading: - extra_passes -= 1 - if extra_passes <= 0: - if len(report): - raise ValueError("Invalid json: %s" % - report) - else: - raise ValueError( - "lvm returned no JSON output!") - - except IOError as ioe: - log_debug(str(ioe)) - pass - - return stdout, report_json, stderr - - def _write_cmd(self, cmd): - cmd_bytes = bytes(cmd, "utf-8") - num_written = self.lvm_shell.stdin.write(cmd_bytes) - assert (num_written == len(cmd_bytes)) - self.lvm_shell.stdin.flush() - - @staticmethod - def _make_non_block(stream): - flags = fcntl(stream, F_GETFL) - fcntl(stream, F_SETFL, flags | os.O_NONBLOCK) - - def __init__(self): - - # Create a temp directory - tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_") - tmp_file = "%s/lvmdbus_report" % (tmp_dir) - - try: - # Lets create fifo for the report output - os.mkfifo(tmp_file, 0o600) - except FileExistsError: - pass - - # We have to open non-blocking as the other side isn't open until - # we actually fork the process. - self.report_fd = os.open(tmp_file, os.O_NONBLOCK) - self.report_stream = os.fdopen(self.report_fd, 'rb', 0) - - # Setup the environment for using our own socket for reporting - local_env = copy.deepcopy(os.environ) - 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" - - # run the lvm shell - self.lvm_shell = subprocess.Popen( - [LVM_CMD + " 32>%s" % tmp_file], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=local_env, - stderr=subprocess.PIPE, close_fds=True, shell=True) - - try: - LVMShellProxy._make_non_block(self.lvm_shell.stdout) - LVMShellProxy._make_non_block(self.lvm_shell.stderr) - - # wait for the first prompt - errors = self._read_until_prompt(no_output=True)[2] - if errors and len(errors): - raise RuntimeError(errors) - except: - raise - finally: - # These will get deleted when the FD count goes to zero so we - # can be sure to clean up correctly no matter how we finish - os.unlink(tmp_file) - os.rmdir(tmp_dir) - - def get_error_msg(self): - # We got an error, lets go fetch the error message - self._write_cmd('lastlog\n') - - # read everything from the STDOUT to the next prompt - stdout, report_json, stderr = self._read_until_prompt() - if 'log' in report_json: - error_msg = "" - # Walk the entire log array and build an error string - for log_entry in report_json['log']: - if log_entry['log_type'] == "error": - if error_msg: - error_msg += ', ' + log_entry['log_message'] - else: - error_msg = log_entry['log_message'] - - return error_msg - - return 'No error reason provided! (missing "log" section)' - - def call_lvm(self, argv, debug=False): - rc = 1 - error_msg = "" - - if self.lvm_shell.poll(): - raise Exception( - self.lvm_shell.returncode, - "Underlying lvm shell process is not present!") - - argv = add_no_notify(argv) - - # create the command string - cmd = " ".join(_quote_arg(arg) for arg in argv) - cmd += "\n" - - # run the command by writing it to the shell's STDIN - self._write_cmd(cmd) - - # read everything from the STDOUT to the next prompt - stdout, report_json, stderr = self._read_until_prompt() - - # Parse the report to see what happened - if 'log' in report_json: - if report_json['log'][-1:][0]['log_ret_code'] == '1': - rc = 0 - else: - error_msg = self.get_error_msg() - - if debug or rc != 0: - log_error(('CMD: %s' % cmd)) - log_error(("EC = %d" % rc)) - log_error(("ERROR_MSG=\n %s\n" % error_msg)) - - return rc, report_json, error_msg - - def exit_shell(self): - try: - self._write_cmd('exit\n') - except Exception as e: - log_error(str(e)) - - def __del__(self): - try: - self.lvm_shell.terminate() - except: - pass - - -if __name__ == "__main__": - shell = LVMShellProxy() - in_line = "start" - try: - while in_line: - in_line = input("lvm> ") - if in_line: - start = time.time() - ret, out, err = shell.call_lvm(in_line.split()) - end = time.time() - - print(("RC: %d" % ret)) - print(("OUT:\n%s" % out)) - print(("ERR:\n%s" % err)) - - print("Command = %f seconds" % (end - start)) - except KeyboardInterrupt: - pass - except EOFError: - pass - except Exception: - traceback.print_exc(file=sys.stdout) diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py.in b/daemons/lvmdbusd/lvm_shell_proxy.py.in new file mode 100644 index 0000000..203de6f --- /dev/null +++ b/daemons/lvmdbusd/lvm_shell_proxy.py.in @@ -0,0 +1,269 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Copyright 2015-2016, Vratislav Podzimek <vpodzime(a)redhat.com> + +import subprocess +import shlex +from fcntl import fcntl, F_GETFL, F_SETFL +import os +import traceback +import sys +import tempfile +import time +import select +import copy + +try: + import simplejson as json +except ImportError: + import json + + +from lvmdbusd.cfg import LVM_CMD +from lvmdbusd.utils import log_debug, log_error, add_no_notify + +SHELL_PROMPT = "lvm> " + + +def _quote_arg(arg): + if len(shlex.split(arg)) > 1: + return '"%s"' % arg + else: + return arg + + +class LVMShellProxy(object): + + @staticmethod + def _read(stream): + tmp = stream.read() + if tmp: + return tmp.decode("utf-8") + return '' + + # Read until we get prompt back and a result + # @param: no_output Caller expects no output to report FD + # Returns stdout, report, stderr (report is JSON!) + def _read_until_prompt(self, no_output=False): + stdout = "" + report = "" + stderr = "" + keep_reading = True + extra_passes = 3 + report_json = {} + prev_report_len = 0 + + # 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 + # FD does not contain valid JSON + while keep_reading: + try: + rd_fd = [ + self.lvm_shell.stdout.fileno(), + self.report_stream.fileno(), + self.lvm_shell.stderr.fileno()] + ready = select.select(rd_fd, [], [], 2) + + for r in ready[0]: + if r == self.lvm_shell.stdout.fileno(): + stdout += LVMShellProxy._read(self.lvm_shell.stdout) + elif r == self.report_stream.fileno(): + report += LVMShellProxy._read(self.report_stream) + elif r == self.lvm_shell.stderr.fileno(): + stderr += LVMShellProxy._read(self.lvm_shell.stderr) + + # Check to see if the lvm process died on us + if self.lvm_shell.poll(): + 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) + if cur_report_len != 0: + # Only bother to parse if we have more data + if prev_report_len != cur_report_len: + prev_report_len = cur_report_len + # Parse the JSON if it's good we are done, + # if not we will try to read some more. + try: + report_json = json.loads(report) + keep_reading = False + except ValueError: + pass + + if keep_reading: + extra_passes -= 1 + if extra_passes <= 0: + if len(report): + raise ValueError("Invalid json: %s" % + report) + else: + raise ValueError( + "lvm returned no JSON output!") + + except IOError as ioe: + log_debug(str(ioe)) + pass + + return stdout, report_json, stderr + + def _write_cmd(self, cmd): + cmd_bytes = bytes(cmd, "utf-8") + num_written = self.lvm_shell.stdin.write(cmd_bytes) + assert (num_written == len(cmd_bytes)) + self.lvm_shell.stdin.flush() + + @staticmethod + def _make_non_block(stream): + flags = fcntl(stream, F_GETFL) + fcntl(stream, F_SETFL, flags | os.O_NONBLOCK) + + def __init__(self): + + # Create a temp directory + tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_") + tmp_file = "%s/lvmdbus_report" % (tmp_dir) + + try: + # Lets create fifo for the report output + os.mkfifo(tmp_file, 0o600) + except FileExistsError: + pass + + # We have to open non-blocking as the other side isn't open until + # we actually fork the process. + self.report_fd = os.open(tmp_file, os.O_NONBLOCK) + self.report_stream = os.fdopen(self.report_fd, 'rb', 0) + + # Setup the environment for using our own socket for reporting + local_env = copy.deepcopy(os.environ) + 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" + + # run the lvm shell + self.lvm_shell = subprocess.Popen( + [LVM_CMD + " 32>%s" % tmp_file], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=local_env, + stderr=subprocess.PIPE, close_fds=True, shell=True) + + try: + LVMShellProxy._make_non_block(self.lvm_shell.stdout) + LVMShellProxy._make_non_block(self.lvm_shell.stderr) + + # wait for the first prompt + errors = self._read_until_prompt(no_output=True)[2] + if errors and len(errors): + raise RuntimeError(errors) + except: + raise + finally: + # These will get deleted when the FD count goes to zero so we + # can be sure to clean up correctly no matter how we finish + os.unlink(tmp_file) + os.rmdir(tmp_dir) + + def get_error_msg(self): + # We got an error, lets go fetch the error message + self._write_cmd('lastlog\n') + + # read everything from the STDOUT to the next prompt + stdout, report_json, stderr = self._read_until_prompt() + if 'log' in report_json: + error_msg = "" + # Walk the entire log array and build an error string + for log_entry in report_json['log']: + if log_entry['log_type'] == "error": + if error_msg: + error_msg += ', ' + log_entry['log_message'] + else: + error_msg = log_entry['log_message'] + + return error_msg + + return 'No error reason provided! (missing "log" section)' + + def call_lvm(self, argv, debug=False): + rc = 1 + error_msg = "" + + if self.lvm_shell.poll(): + raise Exception( + self.lvm_shell.returncode, + "Underlying lvm shell process is not present!") + + argv = add_no_notify(argv) + + # create the command string + cmd = " ".join(_quote_arg(arg) for arg in argv) + cmd += "\n" + + # run the command by writing it to the shell's STDIN + self._write_cmd(cmd) + + # read everything from the STDOUT to the next prompt + stdout, report_json, stderr = self._read_until_prompt() + + # Parse the report to see what happened + if 'log' in report_json: + if report_json['log'][-1:][0]['log_ret_code'] == '1': + rc = 0 + else: + error_msg = self.get_error_msg() + + if debug or rc != 0: + log_error(('CMD: %s' % cmd)) + log_error(("EC = %d" % rc)) + log_error(("ERROR_MSG=\n %s\n" % error_msg)) + + return rc, report_json, error_msg + + def exit_shell(self): + try: + self._write_cmd('exit\n') + except Exception as e: + log_error(str(e)) + + def __del__(self): + try: + self.lvm_shell.terminate() + except: + pass + + +if __name__ == "__main__": + shell = LVMShellProxy() + in_line = "start" + try: + while in_line: + in_line = input("lvm> ") + if in_line: + start = time.time() + ret, out, err = shell.call_lvm(in_line.split()) + end = time.time() + + print(("RC: %d" % ret)) + print(("OUT:\n%s" % out)) + print(("ERR:\n%s" % err)) + + print("Command = %f seconds" % (end - start)) + except KeyboardInterrupt: + pass + except EOFError: + pass + except Exception: + traceback.print_exc(file=sys.stdout) diff --git a/daemons/lvmdbusd/lvmdb.py b/daemons/lvmdbusd/lvmdb.py deleted file mode 100755 index 974e7d7..0000000 --- a/daemons/lvmdbusd/lvmdb.py +++ /dev/null @@ -1,540 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -from collections import OrderedDict - -import pprint as prettyprint -import os -import sys - -from lvmdbusd import cmdhandler -from lvmdbusd.utils import log_debug, log_error - - -class DataStore(object): - def __init__(self, usejson=True): - self.pvs = {} - self.vgs = {} - self.lvs = {} - self.pv_lvs = {} - self.lv_pvs = {} - self.lvs_hidden = {} - - self.pv_path_to_uuid = {} - self.vg_name_to_uuid = {} - self.lv_full_name_to_uuid = {} - - self.lvs_in_vgs = {} - self.pvs_in_vgs = {} - - # self.refresh() - self.num_refreshes = 0 - - if usejson: - self.json = cmdhandler.supports_json() - else: - self.json = usejson - - @staticmethod - def _insert_record(table, key, record, allowed_multiple): - if key in table: - existing = table[key] - - for rec_k, rec_v in record.items(): - if rec_k in allowed_multiple: - # This column name allows us to store multiple value for - # each type - if not isinstance(existing[rec_k], list): - existing_value = existing[rec_k] - existing[rec_k] = [existing_value, rec_v] - else: - existing[rec_k].append(rec_v) - else: - # If something is not expected to have changing values - # lets ensure that - if existing[rec_k] != rec_v: - raise RuntimeError( - "existing[%s]=%s != %s" % - (rec_k, str(existing[rec_k]), - str(rec_v))) - else: - table[key] = record - - @staticmethod - def _pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup): - for p in c_pvs.values(): - # Capture which PVs are associated with which VG - if p['vg_uuid'] not in c_pvs_in_vgs: - c_pvs_in_vgs[p['vg_uuid']] = [] - - if p['vg_name']: - c_pvs_in_vgs[p['vg_uuid']].append( - (p['pv_name'], p['pv_uuid'])) - - # Lookup for translating between /dev/<name> and pv uuid - c_lookup[p['pv_name']] = p['pv_uuid'] - - @staticmethod - def _parse_pvs(_pvs): - pvs = sorted(_pvs, key=lambda pk: pk['pv_name']) - - c_pvs = OrderedDict() - c_lookup = {} - c_pvs_in_vgs = {} - - for p in pvs: - DataStore._insert_record( - c_pvs, p['pv_uuid'], p, - ['pvseg_start', 'pvseg_size', 'segtype']) - - DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) - return c_pvs, c_lookup, c_pvs_in_vgs - - @staticmethod - def _parse_pvs_json(_all): - - c_pvs = OrderedDict() - c_lookup = {} - c_pvs_in_vgs = {} - - # Each item item in the report is a collection of information pertaining - # to the vg - for r in _all['report']: - tmp_pv = [] - - # Get the pv data for this VG. - if 'pv' in r: - tmp_pv.extend(r['pv']) - - # Sort them - sorted_tmp_pv = sorted(tmp_pv, key=lambda pk: pk['pv_name']) - - # Add them to result set - for p in sorted_tmp_pv: - c_pvs[p['pv_uuid']] = p - - if 'pvseg' in r: - for s in r['pvseg']: - r = c_pvs[s['pv_uuid']] - r.setdefault('pvseg_start', []).append(s['pvseg_start']) - r.setdefault('pvseg_size', []).append(s['pvseg_size']) - r.setdefault('segtype', []).append(s['segtype']) - - # TODO: Remove this bug work around when we have orphan segs. - for i in c_pvs.values(): - if 'pvseg_start' not in i: - i['pvseg_start'] = '0' - i['pvseg_size'] = i['pv_pe_count'] - i['segtype'] = 'free' - - DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) - - return c_pvs, c_lookup, c_pvs_in_vgs - - @staticmethod - def _parse_vgs(_vgs): - vgs = sorted(_vgs, key=lambda vk: vk['vg_name']) - - c_vgs = OrderedDict() - c_lookup = {} - - for i in vgs: - c_lookup[i['vg_name']] = i['vg_uuid'] - DataStore._insert_record(c_vgs, i['vg_uuid'], i, []) - - return c_vgs, c_lookup - - @staticmethod - def _parse_vgs_json(_all): - - tmp_vg = [] - for r in _all['report']: - # Get the pv data for this VG. - if 'vg' in r: - tmp_vg.extend(r['vg']) - - # Sort for consistent output, however this is optional - vgs = sorted(tmp_vg, key=lambda vk: vk['vg_name']) - - c_vgs = OrderedDict() - c_lookup = {} - - for i in vgs: - c_lookup[i['vg_name']] = i['vg_uuid'] - c_vgs[i['vg_uuid']] = i - - return c_vgs, c_lookup - - @staticmethod - def _parse_lvs_common(c_lvs, c_lv_full_lookup): - - c_lvs_in_vgs = OrderedDict() - c_lvs_hidden = OrderedDict() - - for i in c_lvs.values(): - if i['vg_uuid'] not in c_lvs_in_vgs: - c_lvs_in_vgs[i['vg_uuid']] = [] - - c_lvs_in_vgs[ - i['vg_uuid']].append( - (i['lv_name'], - (i['lv_attr'], i['lv_layout'], i['lv_role']), - i['lv_uuid'])) - - if i['lv_parent']: - # Lookup what the parent refers too - parent_name = i['lv_parent'] - full_parent_name = "%s/%s" % (i['vg_name'], parent_name) - if full_parent_name not in c_lv_full_lookup: - parent_name = '[%s]' % (parent_name) - full_parent_name = "%s/%s" % (i['vg_name'], parent_name) - - parent_uuid = c_lv_full_lookup[full_parent_name] - - if parent_uuid not in c_lvs_hidden: - c_lvs_hidden[parent_uuid] = [] - - c_lvs_hidden[parent_uuid].append( - (i['lv_uuid'], i['lv_name'])) - - return c_lvs, c_lvs_in_vgs, c_lvs_hidden, c_lv_full_lookup - - @staticmethod - def _parse_lvs(_lvs): - lvs = sorted(_lvs, key=lambda vk: vk['lv_name']) - - c_lvs = OrderedDict() - c_lv_full_lookup = OrderedDict() - - for i in lvs: - full_name = "%s/%s" % (i['vg_name'], i['lv_name']) - c_lv_full_lookup[full_name] = i['lv_uuid'] - DataStore._insert_record( - c_lvs, i['lv_uuid'], i, - ['seg_pe_ranges', 'segtype']) - - return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) - - @staticmethod - def _parse_lvs_json(_all): - - c_lvs = OrderedDict() - c_lv_full_lookup = {} - - # Each item item in the report is a collection of information pertaining - # to the vg - for r in _all['report']: - # Get the lv data for this VG. - if 'lv' in r: - # Add them to result set - for i in r['lv']: - full_name = "%s/%s" % (i['vg_name'], i['lv_name']) - c_lv_full_lookup[full_name] = i['lv_uuid'] - c_lvs[i['lv_uuid']] = i - - # Add in the segment data - if 'seg' in r: - for s in r['seg']: - r = c_lvs[s['lv_uuid']] - r.setdefault('seg_pe_ranges', []).append(s['seg_pe_ranges']) - r.setdefault('segtype', []).append(s['segtype']) - - return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) - - @staticmethod - def _make_list(l): - if not isinstance(l, list): - l = [l] - return l - - @staticmethod - def _parse_seg_entry(se, segtype): - if se: - # print("_parse_seg_entry %s %s" % (str(se), str(segtype))) - device, segs = se.split(":") - start, end = segs.split('-') - return (device, (start, end), segtype) - else: - return ("", (), segtype) - - @staticmethod - def _build_segments(l, seg_types): - rc = [] - l = DataStore._make_list(l) - s = DataStore._make_list(seg_types) - - assert len(l) == len(s) - ls = list(zip(l, s)) - - for i in ls: - if ' ' in i[0]: - tmp = i[0].split(' ') - for t in tmp: - rc.append(DataStore._parse_seg_entry(t, i[1])) - else: - rc.append(DataStore._parse_seg_entry(*i)) - return rc - - @staticmethod - def _pv_device_lv_entry(table, pv_device, lv_uuid, meta, lv_attr, - segment_info): - - if pv_device not in table: - table[pv_device] = {} - - if lv_uuid not in table[pv_device]: - table[pv_device][lv_uuid] = {} - table[pv_device][lv_uuid]['segs'] = [segment_info] - table[pv_device][lv_uuid]['name'] = meta - table[pv_device][lv_uuid]['meta'] = lv_attr - else: - table[pv_device][lv_uuid]['segs'].append(segment_info) - - @staticmethod - def _pv_device_lv_format(pv_device_lvs): - rc = {} - - for pv_device, pd in pv_device_lvs.items(): - lvs = [] - for lv_uuid, ld in sorted(pd.items()): - lvs.append((lv_uuid, ld['name'], ld['meta'], ld['segs'])) - - rc[pv_device] = lvs - return rc - - @staticmethod - def _lvs_device_pv_entry(table, lv_uuid, pv_device, pv_uuid, segment_info): - if lv_uuid not in table: - table[lv_uuid] = {} - - if pv_device not in table[lv_uuid]: - table[lv_uuid][pv_device] = {} - table[lv_uuid][pv_device]['segs'] = [segment_info] - table[lv_uuid][pv_device]['pv_uuid'] = pv_uuid - else: - table[lv_uuid][pv_device]['segs'].append(segment_info) - - @staticmethod - def _lvs_device_pv_format(lvs_device_pvs): - rc = {} - - for lv_uuid, ld in lvs_device_pvs.items(): - pvs = [] - for pv_device, pd in sorted(ld.items()): - pvs.append((pd['pv_uuid'], pv_device, pd['segs'])) - - rc[lv_uuid] = pvs - return rc - - def _parse_pv_in_lvs(self): - pv_device_lvs = {} # What LVs are stored on a PV - lvs_device_pv = {} # Where LV data is stored - - for i in self.lvs.values(): - segs = self._build_segments(i['seg_pe_ranges'], i['segtype']) - for s in segs: - # We are referring to physical device - if '/dev/' in s[0]: - device, r, seg_type = s - - DataStore._pv_device_lv_entry( - pv_device_lvs, device, i['lv_uuid'], i['lv_name'], - (i['lv_attr'], i['lv_layout'], i['lv_role']), - (r[0], r[1], seg_type)) - - # (pv_name, pv_segs, pv_uuid) - DataStore._lvs_device_pv_entry( - lvs_device_pv, i['lv_uuid'], device, - self.pv_path_to_uuid[device], (r[0], r[1], seg_type)) - else: - # TODO Handle the case where the segments refer to a LV - # and not a PV - pass - # print("Handle this %s %s %s" % (s[0], s[1], s[2])) - - # Convert form to needed result for consumption - pv_device_lvs_result = DataStore._pv_device_lv_format(pv_device_lvs) - lvs_device_pv_result = DataStore._lvs_device_pv_format(lvs_device_pv) - - return pv_device_lvs_result, lvs_device_pv_result - - def refresh(self, log=True): - """ - Go out and query lvm for the latest data in as few trips as possible - :param log Add debug log entry/exit messages - :return: None - """ - self.num_refreshes += 1 - if log: - log_debug("lvmdb - refresh entry") - - # Grab everything first then parse it - if self.json: - # Do a single lvm retrieve for everything in json - a = cmdhandler.lvm_full_report_json() - - _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs_json(a) - _vgs, _vgs_lookup = self._parse_vgs_json(a) - _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs_json(a) - - else: - _raw_pvs = cmdhandler.pv_retrieve_with_segs() - _raw_vgs = cmdhandler.vg_retrieve(None) - _raw_lvs = cmdhandler.lv_retrieve_with_segments() - - _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs(_raw_pvs) - _vgs, _vgs_lookup = self._parse_vgs(_raw_vgs) - _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs(_raw_lvs) - - # Set all - self.pvs = _pvs - self.pv_path_to_uuid = _pvs_lookup - self.vg_name_to_uuid = _vgs_lookup - self.lv_full_name_to_uuid = _lvs_lookup - - self.vgs = _vgs - self.lvs = _lvs - self.lvs_in_vgs = _lvs_in_vgs - self.pvs_in_vgs = _pvs_in_vgs - self.lvs_hidden = _lvs_hidden - - # Create lookup table for which LV and segments are on each PV - self.pv_lvs, self.lv_pvs = self._parse_pv_in_lvs() - - if log: - log_debug("lvmdb - refresh exit") - - def fetch_pvs(self, pv_name): - if not pv_name: - return self.pvs.values() - else: - rc = [] - for s in pv_name: - # Ths user could be using a symlink instead of the actual - # block device, make sure we are using actual block device file - # if the pv name isn't in the lookup - if s not in self.pv_path_to_uuid: - s = os.path.realpath(s) - rc.append(self.pvs[self.pv_path_to_uuid[s]]) - return rc - - def pv_missing(self, pv_uuid): - if pv_uuid in self.pvs: - if self.pvs[pv_uuid]['pv_missing'] == '': - return False - return True - - def fetch_vgs(self, vg_name): - if not vg_name: - return self.vgs.values() - else: - rc = [] - for s in vg_name: - rc.append(self.vgs[self.vg_name_to_uuid[s]]) - return rc - - def fetch_lvs(self, lv_names): - try: - if not lv_names: - return self.lvs.values() - else: - rc = [] - for s in lv_names: - rc.append(self.lvs[self.lv_full_name_to_uuid[s]]) - return rc - except KeyError as ke: - log_error("Key %s not found!" % (str(lv_names))) - log_error("lv name to uuid lookup") - for keys in sorted(self.lv_full_name_to_uuid.keys()): - log_error("%s" % (keys)) - log_error("lvs entries by uuid") - for keys in sorted(self.lvs.keys()): - log_error("%s" % (keys)) - raise ke - - def pv_pe_segments(self, pv_uuid): - pv = self.pvs[pv_uuid] - return list(zip(pv['pvseg_start'], pv['pvseg_size'])) - - def pv_contained_lv(self, pv_device): - rc = [] - if pv_device in self.pv_lvs: - rc = self.pv_lvs[pv_device] - return rc - - def lv_contained_pv(self, lv_uuid): - rc = [] - if lv_uuid in self.lv_pvs: - rc = self.lv_pvs[lv_uuid] - return rc - - def lvs_in_vg(self, vg_uuid): - # Return an array of - # (lv_name, (lv_attr, lv_layout, lv_role), lv_uuid) - rc = [] - if vg_uuid in self.lvs_in_vgs: - rc = self.lvs_in_vgs[vg_uuid] - return rc - - def pvs_in_vg(self, vg_uuid): - # Returns an array of (pv_name, pv_uuid) - rc = [] - if vg_uuid in self.pvs_in_vgs: - rc = self.pvs_in_vgs[vg_uuid] - return rc - - def hidden_lvs(self, lv_uuid): - # For a specified LV, return a list of hidden lv_uuid, lv_name - # for it - rc = [] - if lv_uuid in self.lvs_hidden: - rc = self.lvs_hidden[lv_uuid] - return rc - - -if __name__ == "__main__": - pp = prettyprint.PrettyPrinter(indent=4) - - use_json = False - - if len(sys.argv) != 1: - print(len(sys.argv)) - use_json = True - - ds = DataStore(use_json) - ds.refresh() - - print("PVS") - for v in ds.pvs.values(): - pp.pprint(v) - print('PV missing is %s' % ds.pv_missing(v['pv_uuid'])) - - print("VGS") - for v in ds.vgs.values(): - pp.pprint(v) - - print("LVS") - for v in ds.lvs.values(): - pp.pprint(v) - - print("LVS in VG") - for k, v in ds.lvs_in_vgs.items(): - print("VG uuid = %s" % (k)) - pp.pprint(v) - - print("pv_in_lvs") - for k, v in ds.pv_lvs.items(): - print("PV %s contains LVS:" % (k)) - pp.pprint(v) - - for k, v in ds.lv_pvs.items(): - print("LV device = %s" % (k)) - pp.pprint(v) diff --git a/daemons/lvmdbusd/lvmdb.py.in b/daemons/lvmdbusd/lvmdb.py.in new file mode 100644 index 0000000..13ee391 --- /dev/null +++ b/daemons/lvmdbusd/lvmdb.py.in @@ -0,0 +1,540 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from collections import OrderedDict + +import pprint as prettyprint +import os +import sys + +from lvmdbusd import cmdhandler +from lvmdbusd.utils import log_debug, log_error + + +class DataStore(object): + def __init__(self, usejson=True): + self.pvs = {} + self.vgs = {} + self.lvs = {} + self.pv_lvs = {} + self.lv_pvs = {} + self.lvs_hidden = {} + + self.pv_path_to_uuid = {} + self.vg_name_to_uuid = {} + self.lv_full_name_to_uuid = {} + + self.lvs_in_vgs = {} + self.pvs_in_vgs = {} + + # self.refresh() + self.num_refreshes = 0 + + if usejson: + self.json = cmdhandler.supports_json() + else: + self.json = usejson + + @staticmethod + def _insert_record(table, key, record, allowed_multiple): + if key in table: + existing = table[key] + + for rec_k, rec_v in record.items(): + if rec_k in allowed_multiple: + # This column name allows us to store multiple value for + # each type + if not isinstance(existing[rec_k], list): + existing_value = existing[rec_k] + existing[rec_k] = [existing_value, rec_v] + else: + existing[rec_k].append(rec_v) + else: + # If something is not expected to have changing values + # lets ensure that + if existing[rec_k] != rec_v: + raise RuntimeError( + "existing[%s]=%s != %s" % + (rec_k, str(existing[rec_k]), + str(rec_v))) + else: + table[key] = record + + @staticmethod + def _pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup): + for p in c_pvs.values(): + # Capture which PVs are associated with which VG + if p['vg_uuid'] not in c_pvs_in_vgs: + c_pvs_in_vgs[p['vg_uuid']] = [] + + if p['vg_name']: + c_pvs_in_vgs[p['vg_uuid']].append( + (p['pv_name'], p['pv_uuid'])) + + # Lookup for translating between /dev/<name> and pv uuid + c_lookup[p['pv_name']] = p['pv_uuid'] + + @staticmethod + def _parse_pvs(_pvs): + pvs = sorted(_pvs, key=lambda pk: pk['pv_name']) + + c_pvs = OrderedDict() + c_lookup = {} + c_pvs_in_vgs = {} + + for p in pvs: + DataStore._insert_record( + c_pvs, p['pv_uuid'], p, + ['pvseg_start', 'pvseg_size', 'segtype']) + + DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) + return c_pvs, c_lookup, c_pvs_in_vgs + + @staticmethod + def _parse_pvs_json(_all): + + c_pvs = OrderedDict() + c_lookup = {} + c_pvs_in_vgs = {} + + # Each item item in the report is a collection of information pertaining + # to the vg + for r in _all['report']: + tmp_pv = [] + + # Get the pv data for this VG. + if 'pv' in r: + tmp_pv.extend(r['pv']) + + # Sort them + sorted_tmp_pv = sorted(tmp_pv, key=lambda pk: pk['pv_name']) + + # Add them to result set + for p in sorted_tmp_pv: + c_pvs[p['pv_uuid']] = p + + if 'pvseg' in r: + for s in r['pvseg']: + r = c_pvs[s['pv_uuid']] + r.setdefault('pvseg_start', []).append(s['pvseg_start']) + r.setdefault('pvseg_size', []).append(s['pvseg_size']) + r.setdefault('segtype', []).append(s['segtype']) + + # TODO: Remove this bug work around when we have orphan segs. + for i in c_pvs.values(): + if 'pvseg_start' not in i: + i['pvseg_start'] = '0' + i['pvseg_size'] = i['pv_pe_count'] + i['segtype'] = 'free' + + DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) + + return c_pvs, c_lookup, c_pvs_in_vgs + + @staticmethod + def _parse_vgs(_vgs): + vgs = sorted(_vgs, key=lambda vk: vk['vg_name']) + + c_vgs = OrderedDict() + c_lookup = {} + + for i in vgs: + c_lookup[i['vg_name']] = i['vg_uuid'] + DataStore._insert_record(c_vgs, i['vg_uuid'], i, []) + + return c_vgs, c_lookup + + @staticmethod + def _parse_vgs_json(_all): + + tmp_vg = [] + for r in _all['report']: + # Get the pv data for this VG. + if 'vg' in r: + tmp_vg.extend(r['vg']) + + # Sort for consistent output, however this is optional + vgs = sorted(tmp_vg, key=lambda vk: vk['vg_name']) + + c_vgs = OrderedDict() + c_lookup = {} + + for i in vgs: + c_lookup[i['vg_name']] = i['vg_uuid'] + c_vgs[i['vg_uuid']] = i + + return c_vgs, c_lookup + + @staticmethod + def _parse_lvs_common(c_lvs, c_lv_full_lookup): + + c_lvs_in_vgs = OrderedDict() + c_lvs_hidden = OrderedDict() + + for i in c_lvs.values(): + if i['vg_uuid'] not in c_lvs_in_vgs: + c_lvs_in_vgs[i['vg_uuid']] = [] + + c_lvs_in_vgs[ + i['vg_uuid']].append( + (i['lv_name'], + (i['lv_attr'], i['lv_layout'], i['lv_role']), + i['lv_uuid'])) + + if i['lv_parent']: + # Lookup what the parent refers too + parent_name = i['lv_parent'] + full_parent_name = "%s/%s" % (i['vg_name'], parent_name) + if full_parent_name not in c_lv_full_lookup: + parent_name = '[%s]' % (parent_name) + full_parent_name = "%s/%s" % (i['vg_name'], parent_name) + + parent_uuid = c_lv_full_lookup[full_parent_name] + + if parent_uuid not in c_lvs_hidden: + c_lvs_hidden[parent_uuid] = [] + + c_lvs_hidden[parent_uuid].append( + (i['lv_uuid'], i['lv_name'])) + + return c_lvs, c_lvs_in_vgs, c_lvs_hidden, c_lv_full_lookup + + @staticmethod + def _parse_lvs(_lvs): + lvs = sorted(_lvs, key=lambda vk: vk['lv_name']) + + c_lvs = OrderedDict() + c_lv_full_lookup = OrderedDict() + + for i in lvs: + full_name = "%s/%s" % (i['vg_name'], i['lv_name']) + c_lv_full_lookup[full_name] = i['lv_uuid'] + DataStore._insert_record( + c_lvs, i['lv_uuid'], i, + ['seg_pe_ranges', 'segtype']) + + return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) + + @staticmethod + def _parse_lvs_json(_all): + + c_lvs = OrderedDict() + c_lv_full_lookup = {} + + # Each item item in the report is a collection of information pertaining + # to the vg + for r in _all['report']: + # Get the lv data for this VG. + if 'lv' in r: + # Add them to result set + for i in r['lv']: + full_name = "%s/%s" % (i['vg_name'], i['lv_name']) + c_lv_full_lookup[full_name] = i['lv_uuid'] + c_lvs[i['lv_uuid']] = i + + # Add in the segment data + if 'seg' in r: + for s in r['seg']: + r = c_lvs[s['lv_uuid']] + r.setdefault('seg_pe_ranges', []).append(s['seg_pe_ranges']) + r.setdefault('segtype', []).append(s['segtype']) + + return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) + + @staticmethod + def _make_list(l): + if not isinstance(l, list): + l = [l] + return l + + @staticmethod + def _parse_seg_entry(se, segtype): + if se: + # print("_parse_seg_entry %s %s" % (str(se), str(segtype))) + device, segs = se.split(":") + start, end = segs.split('-') + return (device, (start, end), segtype) + else: + return ("", (), segtype) + + @staticmethod + def _build_segments(l, seg_types): + rc = [] + l = DataStore._make_list(l) + s = DataStore._make_list(seg_types) + + assert len(l) == len(s) + ls = list(zip(l, s)) + + for i in ls: + if ' ' in i[0]: + tmp = i[0].split(' ') + for t in tmp: + rc.append(DataStore._parse_seg_entry(t, i[1])) + else: + rc.append(DataStore._parse_seg_entry(*i)) + return rc + + @staticmethod + def _pv_device_lv_entry(table, pv_device, lv_uuid, meta, lv_attr, + segment_info): + + if pv_device not in table: + table[pv_device] = {} + + if lv_uuid not in table[pv_device]: + table[pv_device][lv_uuid] = {} + table[pv_device][lv_uuid]['segs'] = [segment_info] + table[pv_device][lv_uuid]['name'] = meta + table[pv_device][lv_uuid]['meta'] = lv_attr + else: + table[pv_device][lv_uuid]['segs'].append(segment_info) + + @staticmethod + def _pv_device_lv_format(pv_device_lvs): + rc = {} + + for pv_device, pd in pv_device_lvs.items(): + lvs = [] + for lv_uuid, ld in sorted(pd.items()): + lvs.append((lv_uuid, ld['name'], ld['meta'], ld['segs'])) + + rc[pv_device] = lvs + return rc + + @staticmethod + def _lvs_device_pv_entry(table, lv_uuid, pv_device, pv_uuid, segment_info): + if lv_uuid not in table: + table[lv_uuid] = {} + + if pv_device not in table[lv_uuid]: + table[lv_uuid][pv_device] = {} + table[lv_uuid][pv_device]['segs'] = [segment_info] + table[lv_uuid][pv_device]['pv_uuid'] = pv_uuid + else: + table[lv_uuid][pv_device]['segs'].append(segment_info) + + @staticmethod + def _lvs_device_pv_format(lvs_device_pvs): + rc = {} + + for lv_uuid, ld in lvs_device_pvs.items(): + pvs = [] + for pv_device, pd in sorted(ld.items()): + pvs.append((pd['pv_uuid'], pv_device, pd['segs'])) + + rc[lv_uuid] = pvs + return rc + + def _parse_pv_in_lvs(self): + pv_device_lvs = {} # What LVs are stored on a PV + lvs_device_pv = {} # Where LV data is stored + + for i in self.lvs.values(): + segs = self._build_segments(i['seg_pe_ranges'], i['segtype']) + for s in segs: + # We are referring to physical device + if '/dev/' in s[0]: + device, r, seg_type = s + + DataStore._pv_device_lv_entry( + pv_device_lvs, device, i['lv_uuid'], i['lv_name'], + (i['lv_attr'], i['lv_layout'], i['lv_role']), + (r[0], r[1], seg_type)) + + # (pv_name, pv_segs, pv_uuid) + DataStore._lvs_device_pv_entry( + lvs_device_pv, i['lv_uuid'], device, + self.pv_path_to_uuid[device], (r[0], r[1], seg_type)) + else: + # TODO Handle the case where the segments refer to a LV + # and not a PV + pass + # print("Handle this %s %s %s" % (s[0], s[1], s[2])) + + # Convert form to needed result for consumption + pv_device_lvs_result = DataStore._pv_device_lv_format(pv_device_lvs) + lvs_device_pv_result = DataStore._lvs_device_pv_format(lvs_device_pv) + + return pv_device_lvs_result, lvs_device_pv_result + + def refresh(self, log=True): + """ + Go out and query lvm for the latest data in as few trips as possible + :param log Add debug log entry/exit messages + :return: None + """ + self.num_refreshes += 1 + if log: + log_debug("lvmdb - refresh entry") + + # Grab everything first then parse it + if self.json: + # Do a single lvm retrieve for everything in json + a = cmdhandler.lvm_full_report_json() + + _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs_json(a) + _vgs, _vgs_lookup = self._parse_vgs_json(a) + _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs_json(a) + + else: + _raw_pvs = cmdhandler.pv_retrieve_with_segs() + _raw_vgs = cmdhandler.vg_retrieve(None) + _raw_lvs = cmdhandler.lv_retrieve_with_segments() + + _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs(_raw_pvs) + _vgs, _vgs_lookup = self._parse_vgs(_raw_vgs) + _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs(_raw_lvs) + + # Set all + self.pvs = _pvs + self.pv_path_to_uuid = _pvs_lookup + self.vg_name_to_uuid = _vgs_lookup + self.lv_full_name_to_uuid = _lvs_lookup + + self.vgs = _vgs + self.lvs = _lvs + self.lvs_in_vgs = _lvs_in_vgs + self.pvs_in_vgs = _pvs_in_vgs + self.lvs_hidden = _lvs_hidden + + # Create lookup table for which LV and segments are on each PV + self.pv_lvs, self.lv_pvs = self._parse_pv_in_lvs() + + if log: + log_debug("lvmdb - refresh exit") + + def fetch_pvs(self, pv_name): + if not pv_name: + return self.pvs.values() + else: + rc = [] + for s in pv_name: + # Ths user could be using a symlink instead of the actual + # block device, make sure we are using actual block device file + # if the pv name isn't in the lookup + if s not in self.pv_path_to_uuid: + s = os.path.realpath(s) + rc.append(self.pvs[self.pv_path_to_uuid[s]]) + return rc + + def pv_missing(self, pv_uuid): + if pv_uuid in self.pvs: + if self.pvs[pv_uuid]['pv_missing'] == '': + return False + return True + + def fetch_vgs(self, vg_name): + if not vg_name: + return self.vgs.values() + else: + rc = [] + for s in vg_name: + rc.append(self.vgs[self.vg_name_to_uuid[s]]) + return rc + + def fetch_lvs(self, lv_names): + try: + if not lv_names: + return self.lvs.values() + else: + rc = [] + for s in lv_names: + rc.append(self.lvs[self.lv_full_name_to_uuid[s]]) + return rc + except KeyError as ke: + log_error("Key %s not found!" % (str(lv_names))) + log_error("lv name to uuid lookup") + for keys in sorted(self.lv_full_name_to_uuid.keys()): + log_error("%s" % (keys)) + log_error("lvs entries by uuid") + for keys in sorted(self.lvs.keys()): + log_error("%s" % (keys)) + raise ke + + def pv_pe_segments(self, pv_uuid): + pv = self.pvs[pv_uuid] + return list(zip(pv['pvseg_start'], pv['pvseg_size'])) + + def pv_contained_lv(self, pv_device): + rc = [] + if pv_device in self.pv_lvs: + rc = self.pv_lvs[pv_device] + return rc + + def lv_contained_pv(self, lv_uuid): + rc = [] + if lv_uuid in self.lv_pvs: + rc = self.lv_pvs[lv_uuid] + return rc + + def lvs_in_vg(self, vg_uuid): + # Return an array of + # (lv_name, (lv_attr, lv_layout, lv_role), lv_uuid) + rc = [] + if vg_uuid in self.lvs_in_vgs: + rc = self.lvs_in_vgs[vg_uuid] + return rc + + def pvs_in_vg(self, vg_uuid): + # Returns an array of (pv_name, pv_uuid) + rc = [] + if vg_uuid in self.pvs_in_vgs: + rc = self.pvs_in_vgs[vg_uuid] + return rc + + def hidden_lvs(self, lv_uuid): + # For a specified LV, return a list of hidden lv_uuid, lv_name + # for it + rc = [] + if lv_uuid in self.lvs_hidden: + rc = self.lvs_hidden[lv_uuid] + return rc + + +if __name__ == "__main__": + pp = prettyprint.PrettyPrinter(indent=4) + + use_json = False + + if len(sys.argv) != 1: + print(len(sys.argv)) + use_json = True + + ds = DataStore(use_json) + ds.refresh() + + print("PVS") + for v in ds.pvs.values(): + pp.pprint(v) + print('PV missing is %s' % ds.pv_missing(v['pv_uuid'])) + + print("VGS") + for v in ds.vgs.values(): + pp.pprint(v) + + print("LVS") + for v in ds.lvs.values(): + pp.pprint(v) + + print("LVS in VG") + for k, v in ds.lvs_in_vgs.items(): + print("VG uuid = %s" % (k)) + pp.pprint(v) + + print("pv_in_lvs") + for k, v in ds.pv_lvs.items(): + print("PV %s contains LVS:" % (k)) + pp.pprint(v) + + for k, v in ds.lv_pvs.items(): + print("LV device = %s" % (k)) + pp.pprint(v) diff --git a/daemons/lvmdbusd/lvmdbusd.in b/daemons/lvmdbusd/lvmdbusd.in old mode 100755 new mode 100644

1 0

master - test: lvmdbusd is used for process name
by Marian Csontos 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2f4c2a43d49d90875ea31… Commit: 2f4c2a43d49d90875ea31b1507cd0dfcdb049e88 Parent: b76c6951aa5c41b19fc34342ea2e946d7e0a3d24 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Dec 12 12:14:15 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Dec 12 13:17:07 2017 +0100 test: lvmdbusd is used for process name lvmdbusd was started, but the process was not recognized by pgrep. - configure does not make the script executable - set the flag explicitly when running make check, - process name changed to lvmdbusd. The previous python3 value originated from the use of /usr/bin/env. --- test/lib/aux.sh | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index de63167..a436f84 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -318,7 +318,7 @@ prepare_lvmdbusd() { # FIXME: This is not correct! Daemon is auto started. echo -n "## checking lvmdbusd is NOT running..." - if pgrep -f -l lvmdbusd | grep python3 ; then + if pgrep -f -l lvmdbusd | grep python3 || pgrep -x -l lvmdbusd ; then skip "Cannot run lvmdbusd while existing lvmdbusd process exists" fi echo ok @@ -327,6 +327,10 @@ prepare_lvmdbusd() { if test -z "${installed_testsuite+varset}"; then # NOTE: this is always present - additional checks are needed: daemon="$abs_top_builddir/daemons/lvmdbusd/lvmdbusd" + if ! test -x "$daemon" && chmod ugo+x "$daemon"; then + echo "Failed to make '$daemon' executable">&2 + return 1 + fi # Setup the python path so we can run export PYTHONPATH="$abs_top_builddir/daemons" else @@ -351,12 +355,9 @@ prepare_lvmdbusd() { sleep 1 echo -n "## checking lvmdbusd IS running..." - if ! pgrep -f -l lvmdbusd | grep python3; then - echo "Failed to start lvmdbusd daemon" - return 1 - fi + comm= # TODO: Is there a better check than wait 1 second and check pid? - if ! ps -p $pid -o comm= >/dev/null || [[ $(ps -p $pid -o comm=) != python3 ]]; then + if ! comm=$(ps -p $pid -o comm=) >/dev/null || [[ $comm != lvmdbusd ]]; then echo "Failed to start lvmdbusd daemon" return 1 fi

1 0

master - format_text: Adjust metadata alignment calculation.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b76c6951aa5c41b19fc34… Commit: b76c6951aa5c41b19fc34342ea2e946d7e0a3d24 Parent: 053d35de473aafe641f595b1182626ea39fc0ab0 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 20:25:03 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 20:25:03 2017 +0000 format_text: Adjust metadata alignment calculation. Use new ALIGN_ABSOLUTE macro when calculating the start location of new metadata and adjust the end of buffer detection so that there is no longer an imposed gap between old and new metadata. --- WHATS_NEW | 1 + lib/format_text/format-text.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 6f13fe3..9ff8b51 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Refactor and adjust text format metadata alignment calculation. Fix python3 path in lvmdbusd to use value detected by configure. Reduce checks for active LVs in vgchange before background polling. Ensure _node_send_message always uses clean status of thin pool. diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c226131..154d748 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -487,12 +487,11 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md /* FIXME Assume only one VG per mdah for now */ return alignment; - /* Calculate new start position within buffer rounded up to absolute alignment */ - new_start_offset = rlocn->offset + rlocn->size + - (alignment - (mdac_area_start + rlocn->offset + rlocn->size) % alignment); + /* Calculate new start position relative to start of buffer rounded up to absolute alignment */ + new_start_offset = ALIGN_ABSOLUTE(rlocn->offset + rlocn->size, mdac_area_start, alignment); /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ - if (new_start_offset > mdah->size - MDA_HEADER_SIZE) + if (new_start_offset >= mdah->size) new_start_offset -= (mdah->size - MDA_HEADER_SIZE); return new_start_offset; @@ -816,10 +815,9 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, rlocn->offset = mdac->rlocn.offset; rlocn->size = mdac->rlocn.size; rlocn->checksum = mdac->rlocn.checksum; - log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " - FMTu64, precommit ? "Pre-" : "", vg->name, - mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, - dev_name(mdac->area.dev), mdac->area.start); + log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " FMTu64 " (offset " FMTu64 ", size " FMTu64 ")", + precommit ? "Pre-" : "", vg->name, mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, + dev_name(mdac->area.dev), mdac->area.start, mdac->rlocn.offset, mdac->rlocn.size); } else log_debug_metadata("Wiping pre-committed %s %smetadata from %s " "header at " FMTu64, vg->name, @@ -1282,13 +1280,13 @@ int vgname_from_mda(const struct format_type *fmt, if (!validate_name(vgsummary->vgname)) return_0; - log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 + log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 " with wrap " FMTu32 " (in area at " FMTu64 " size " FMTu64 ") for %s (" FMTVGID ")", dev_name(dev_area->dev), used_cached_metadata ? "Using cached" : "Found", dev_area->start + rlocn->offset, - rlocn->size, dev_area->start, dev_area->size, vgsummary->vgname, + rlocn->size, wrap, dev_area->start, dev_area->size, vgsummary->vgname, (char *)&vgsummary->vgid); if (mda_free_sectors) {

1 0

master - format_text: Use absolute alignment to calculate metadata usage
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=053d35de473aafe641f59… Commit: 053d35de473aafe641f595b1182626ea39fc0ab0 Parent: 2db67a8ea09a6f1073583e135bfb7b66228d3526 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 17:14:38 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 17:14:38 2017 +0000 format_text: Use absolute alignment to calculate metadata usage Currently both start and offset should always be divisible by alignment, so this should have no effect, but a later patch will increase alignment so these variables can no longer be optimised out. --- lib/format_text/format-text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 881fd4d..c226131 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1292,7 +1292,7 @@ int vgname_from_mda(const struct format_type *fmt, (char *)&vgsummary->vgid); if (mda_free_sectors) { - current_usage = ALIGN_ABSOLUTE(rlocn->size, 0, MDA_ORIGINAL_ALIGNMENT); + current_usage = ALIGN_ABSOLUTE(rlocn->size, dev_area->start + rlocn->offset, MDA_ORIGINAL_ALIGNMENT); buffer_size = mdah->size - MDA_HEADER_SIZE;

1 0

master - format_text: Move metadata size checking into separate fn.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2db67a8ea09a6f1073583… Commit: 2db67a8ea09a6f1073583e135bfb7b66228d3526 Parent: 46393bfca0692ebddbecdfb1f3b8699c3caa4f16 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 17:08:29 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 17:08:29 2017 +0000 format_text: Move metadata size checking into separate fn. Move checks into _metadata_fits_into_buffer() and add macro for alignment. --- lib/format_text/format-text.c | 55 +++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 13 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 0dbab11..881fd4d 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -37,6 +37,12 @@ #include <dirent.h> #include <ctype.h> +/* + * Round up offset within buffer to next location that is an exact multiple of alignment. + * (We shouldn't assume the start of the metadata area was aligned the same way when it was created.) + */ +#define ALIGN_ABSOLUTE(offset, buffer_start, alignment) ((offset) + (alignment) - UINT64_C(1) - ((buffer_start) + (offset) + (alignment) - UINT64_C(1)) % (alignment)) + static struct format_instance *_text_create_text_instance(const struct format_type *fmt, const struct format_instance_ctx *fic); @@ -615,6 +621,34 @@ static struct volume_group *_vg_read_precommit_raw(struct format_instance *fid, return vg; } +static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_header *mdah, + struct raw_locn *rlocn, uint64_t new_wrap) +{ + uint64_t old_wrap = 0; /* Amount of wrap around in existing metadata */ + uint64_t new_end; /* The end location of the new metadata */ + + /* Do we have existing metadata that ends beyond the end of the buffer? */ + if (rlocn && (rlocn->offset + rlocn->size > mdah->size)) + old_wrap = (rlocn->offset + rlocn->size) - mdah->size; + + new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : + mdac->rlocn.offset + mdac->rlocn.size; + + /* If both wrap around, there's necessarily overlap */ + if (new_wrap && old_wrap) + return_0; + + /* If either wraps around, does the new end fall beyond the old start? */ + if (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) + return_0; + + /* Does the total amount of metadata, old and new, fit inside the buffer? */ + if (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size) + return_0; + + return 1; +} + static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct metadata_area *mda) { @@ -624,7 +658,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct mda_header *mdah; struct pv_list *pvl; int r = 0; - uint64_t new_wrap = 0, old_wrap = 0, new_end; + uint64_t new_wrap; /* Number of bytes of new metadata that wrap around to start of buffer */ int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; @@ -657,21 +691,16 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); - mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); mdac->rlocn.size = fidtc->raw_metadata_buf_size; + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); + if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) new_wrap = (mdac->rlocn.offset + mdac->rlocn.size) - mdah->size; + else + new_wrap = 0; - if (rlocn && (rlocn->offset + rlocn->size > mdah->size)) - old_wrap = (rlocn->offset + rlocn->size) - mdah->size; - - new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : - mdac->rlocn.offset + mdac->rlocn.size; - - if ((new_wrap && old_wrap) || - (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) || - (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size)) { + if (!_metadata_fits_into_buffer(mdac, mdah, rlocn, new_wrap)) { log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes with " FMTu64 " used)", vg->name, dev_name(mdac->area.dev), mdac->rlocn.size, mdah->size - MDA_HEADER_SIZE, rlocn ? rlocn->size : 0); goto out; @@ -1263,8 +1292,8 @@ int vgname_from_mda(const struct format_type *fmt, (char *)&vgsummary->vgid); if (mda_free_sectors) { - current_usage = (rlocn->size + SECTOR_SIZE - UINT64_C(1)) - - (rlocn->size + SECTOR_SIZE - UINT64_C(1)) % SECTOR_SIZE; + current_usage = ALIGN_ABSOLUTE(rlocn->size, 0, MDA_ORIGINAL_ALIGNMENT); + buffer_size = mdah->size - MDA_HEADER_SIZE; if (current_usage * 2 >= buffer_size)

1 0

master - format_text: Log additional circular buffer information.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=46393bfca0692ebddbecd… Commit: 46393bfca0692ebddbecdfb1f3b8699c3caa4f16 Parent: 49d486319fa6cb48e693c364ee6d72e4b6c364d2 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 15:59:40 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 16:07:34 2017 +0000 format_text: Log additional circular buffer information. --- lib/format_text/format-text.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index adaf0a8..0dbab11 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -541,8 +541,8 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, wrap = (uint32_t) ((rlocn->offset + rlocn->size) - mdah->size); if (wrap > rlocn->offset) { - log_error("VG %s metadata too large for circular buffer", - vgname); + log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes)", + vgname, dev_name(area->dev), rlocn->size, mdah->size - MDA_HEADER_SIZE); goto out; } @@ -672,14 +672,14 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if ((new_wrap && old_wrap) || (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) || (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size)) { - log_error("VG %s metadata too large for circular buffer", - vg->name); + log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes with " FMTu64 " used)", + vg->name, dev_name(mdac->area.dev), mdac->rlocn.size, mdah->size - MDA_HEADER_SIZE, rlocn ? rlocn->size : 0); goto out; } - log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + - mdac->rlocn.offset, mdac->rlocn.size - new_wrap); + mdac->rlocn.offset, mdac->rlocn.size - new_wrap, mdac->rlocn.size); /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, @@ -688,9 +688,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64, + log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64, dev_name(mdac->area.dev), mdac->area.start + - MDA_HEADER_SIZE, new_wrap); + MDA_HEADER_SIZE, new_wrap, mdac->rlocn.size); if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, (size_t) new_wrap, MDA_CONTENT_REASON(mda_is_primary(mda)), @@ -1228,8 +1228,8 @@ int vgname_from_mda(const struct format_type *fmt, wrap = (uint32_t) ((rlocn->offset + rlocn->size) - mdah->size); if (wrap > rlocn->offset) { - log_error("%s: metadata too large for circular buffer", - dev_name(dev_area->dev)); + log_error("%s: metadata (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes)", + dev_name(dev_area->dev), rlocn->size, mdah->size - MDA_HEADER_SIZE); return 0; }

1 0

master - format_text: Replace PRI with FMT.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=49d486319fa6cb48e693c… Commit: 49d486319fa6cb48e693c364ee6d72e4b6c364d2 Parent: 75d4d8e9a42a4709ed40348395b1e75dff4197e8 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 15:32:53 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 15:39:25 2017 +0000 format_text: Replace PRI with FMT. --- lib/format_text/archiver.c | 2 +- lib/format_text/export.c | 16 +++++----- lib/format_text/format-text.c | 58 ++++++++++++++++++++-------------------- lib/format_text/text_label.c | 6 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 3e519ca..1eb6654 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -413,7 +413,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg, new_pvl->pv = pv; dm_list_add(&new_pvs, &new_pvl->list); - log_verbose("Set up physical volume for \"%s\" with %" PRIu64 + log_verbose("Set up physical volume for \"%s\" with " FMTu64 " available sectors.", pv_dev_name(pv), pv_size(pv)); } diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 9fede20..e535237 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -121,7 +121,7 @@ static int _extend_buffer(struct formatter *f) { char *newbuf; - log_debug_metadata("Doubling metadata output buffer to %" PRIu32, + log_debug_metadata("Doubling metadata output buffer to " FMTu32, f->data.buf.size * 2); if (!(newbuf = dm_realloc(f->data.buf.start, f->data.buf.size * 2))) { @@ -561,15 +561,15 @@ static int _print_pvs(struct formatter *f, struct volume_group *vg) if (!_out_list(f, &pv->tags, "tags")) return_0; - outsize(f, pv->size, "dev_size = %" PRIu64, pv->size); + outsize(f, pv->size, "dev_size = " FMTu64, pv->size); - outf(f, "pe_start = %" PRIu64, pv->pe_start); + outf(f, "pe_start = " FMTu64, pv->pe_start); outsize(f, vg->extent_size * (uint64_t) pv->pe_count, "pe_count = %u", pv->pe_count); if (pv->ba_start && pv->ba_size) { - outf(f, "ba_start = %" PRIu64, pv->ba_start); - outsize(f, pv->ba_size, "ba_size = %" PRIu64, pv->ba_size); + outf(f, "ba_start = " FMTu64, pv->ba_start); + outsize(f, pv->ba_size, "ba_size = " FMTu64, pv->ba_size); } _dec_indent(f); @@ -631,7 +631,7 @@ int out_areas(struct formatter *f, const struct lv_segment *seg, switch (seg_type(seg, s)) { case AREA_PV: if (!(pv = seg_pv(seg, s))) { - log_error(INTERNAL_ERROR "Missing PV for area %" PRIu32 " of %s segment of LV %s.", + log_error(INTERNAL_ERROR "Missing PV for area " FMTu32 " of %s segment of LV %s.", s, type, display_lvname(seg->lv)); return 0; } @@ -670,7 +670,7 @@ int out_areas(struct formatter *f, const struct lv_segment *seg, break; case AREA_UNASSIGNED: - log_error(INTERNAL_ERROR "Invalid type for area %" PRIu32 " of %s segment of LV %s.", + log_error(INTERNAL_ERROR "Invalid type for area " FMTu32 " of %s segment of LV %s.", s, type, display_lvname(seg->lv)); return 0; } @@ -694,7 +694,7 @@ static int _print_timestamp(struct formatter *f, "%Y-%m-%d %T %z", local_tm)) buf[0] = 0; - outfc(f, buf, "%s = %" PRIu64, name, (uint64_t) ts); + outfc(f, buf, "%s = " FMTu64, name, (uint64_t) ts); } return 1; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c96fad9..adaf0a8 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -183,8 +183,8 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, mdac = (struct mda_context *) mda->metadata_locn; - log_print("Found text metadata area: offset=%" PRIu64 ", size=%" - PRIu64, mdac->area.start, mdac->area.size); + log_print("Found text metadata area: offset=" FMTu64 ", size=" + FMTu64, mdac->area.start, mdac->area.size); area = &mdac->area; if (!dev_open_readonly(area->dev)) @@ -240,8 +240,8 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, /* FIXME: Validate region, pull out timestamp?, etc */ /* FIXME: Do something with this region */ log_verbose ("Found LVM2 metadata record at " - "offset=%"PRIu64", size=%"PRIsize_t", " - "offset2=%"PRIu64" size2=%"PRIsize_t, + "offset=" FMTu64 ", size=" FMTsize_t ", " + "offset2=" FMTu64 " size2=" FMTsize_t, offset, size, offset2, size2); offset = prev_sector; size = SECTOR_SIZE; @@ -333,7 +333,7 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev MDA_HEADER_SIZE - sizeof(mdah->checksum_xl)))) { log_error("Incorrect metadata area header checksum on %s" - " at offset %"PRIu64, dev_name(dev_area->dev), + " at offset " FMTu64, dev_name(dev_area->dev), dev_area->start); return 0; } @@ -342,21 +342,21 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev if (strncmp((char *)mdah->magic, FMTT_MAGIC, sizeof(mdah->magic))) { log_error("Wrong magic number in metadata area header on %s" - " at offset %"PRIu64, dev_name(dev_area->dev), + " at offset " FMTu64, dev_name(dev_area->dev), dev_area->start); return 0; } if (mdah->version != FMTT_VERSION) { log_error("Incompatible metadata area header version: %d on %s" - " at offset %"PRIu64, mdah->version, + " at offset " FMTu64, mdah->version, dev_name(dev_area->dev), dev_area->start); return 0; } if (mdah->start != dev_area->start) { - log_error("Incorrect start sector in metadata area header: %" - PRIu64" on %s at offset %"PRIu64, mdah->start, + log_error("Incorrect start sector in metadata area header: " + FMTu64 " on %s at offset " FMTu64, mdah->start, dev_name(dev_area->dev), dev_area->start); return 0; } @@ -456,7 +456,7 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, (isspace(vgnamebuf[len]) || vgnamebuf[len] == '{')) return rlocn; - log_debug_metadata("Volume group name found in %smetadata on %s at %" PRIu64 " does " + log_debug_metadata("Volume group name found in %smetadata on %s at " FMTu64 " does " "not match expected name %s.", *precommitted ? "precommitted " : "", dev_name(dev_area->dev), dev_area->start + rlocn->offset, vgname); @@ -557,13 +557,13 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, goto_out; if (vg) - log_debug_metadata("Read %s %smetadata (%u) from %s at %" PRIu64 " size %" - PRIu64, vg->name, precommitted ? "pre-commit " : "", + log_debug_metadata("Read %s %smetadata (%u) from %s at " FMTu64 " size " + FMTu64, vg->name, precommitted ? "pre-commit " : "", vg->seqno, dev_name(area->dev), area->start + rlocn->offset, rlocn->size); else - log_debug_metadata("Skipped reading %smetadata from %s at %" PRIu64 " size %" - PRIu64 " with matching checksum.", precommitted ? "pre-commit " : "", + log_debug_metadata("Skipped reading %smetadata from %s at " FMTu64 " size " + FMTu64 " with matching checksum.", precommitted ? "pre-commit " : "", dev_name(area->dev), area->start + rlocn->offset, rlocn->size); @@ -677,7 +677,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto out; } - log_debug_metadata("Writing %s metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + mdac->rlocn.offset, mdac->rlocn.size - new_wrap); @@ -688,7 +688,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing wrapped metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); @@ -787,13 +787,13 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, rlocn->offset = mdac->rlocn.offset; rlocn->size = mdac->rlocn.size; rlocn->checksum = mdac->rlocn.checksum; - log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at %" - PRIu64, precommit ? "Pre-" : "", vg->name, + log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " + FMTu64, precommit ? "Pre-" : "", vg->name, mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, dev_name(mdac->area.dev), mdac->area.start); } else log_debug_metadata("Wiping pre-committed %s %smetadata from %s " - "header at %" PRIu64, vg->name, + "header at " FMTu64, vg->name, mda_is_ignored(mda) ? "(ignored) " : "", dev_name(mdac->area.dev), mdac->area.start); @@ -1253,8 +1253,8 @@ int vgname_from_mda(const struct format_type *fmt, if (!validate_name(vgsummary->vgname)) return_0; - log_debug_metadata("%s: %s metadata at %" PRIu64 " size %" PRIu64 - " (in area at %" PRIu64 " size %" PRIu64 + log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 + " (in area at " FMTu64 " size " FMTu64 ") for %s (" FMTVGID ")", dev_name(dev_area->dev), used_cached_metadata ? "Using cached" : "Found", @@ -1402,8 +1402,8 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume continue; mdac = (struct mda_context *) mda->metadata_locn; - log_debug_metadata("Creating metadata area on %s at sector %" - PRIu64 " size %" PRIu64 " sectors", + log_debug_metadata("Creating metadata area on %s at sector " + FMTu64 " size " FMTu64 " sectors", dev_name(mdac->area.dev), mdac->area.start >> SECTOR_SHIFT, mdac->area.size >> SECTOR_SHIFT); @@ -1782,10 +1782,10 @@ static int _mda_export_text_raw(struct metadata_area *mda, return 1; /* pretend the MDA does not exist */ return config_make_nodes(cft, parent, NULL, - "ignore = %" PRId64, (int64_t) mda_is_ignored(mda), - "start = %" PRId64, (int64_t) mdc->area.start, - "size = %" PRId64, (int64_t) mdc->area.size, - "free_sectors = %" PRId64, (int64_t) mdc->free_sectors, + "ignore = " FMTd64, (int64_t) mda_is_ignored(mda), + "start = " FMTd64, (int64_t) mdc->area.start, + "size = " FMTd64, (int64_t) mdc->area.size, + "free_sectors = " FMTd64, (int64_t) mdc->free_sectors, NULL) ? 1 : 0; } @@ -2306,13 +2306,13 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, if (limit_applied) log_very_verbose("Using limited metadata area size on %s " - "with value %" PRIu64 " (limited by %s of " + "with value " FMTu64 " (limited by %s of " FMTu64 ").", pv_dev_name(pv), mda_size, limit_name, limit); if (mda_size) { if (mda_size < MDA_SIZE_MIN) { - log_error("Metadata area size too small: %" PRIu64" bytes. " + log_error("Metadata area size too small: " FMTu64 " bytes. " "It must be at least %u bytes.", mda_size, MDA_SIZE_MIN); goto bad; } diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index c567709..7058f70 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -148,7 +148,7 @@ static int _text_write(struct label *label, void *buf) !xlate64(pvhdr->disk_areas_xl[mda2].size)) mda2 = 0; - log_debug_metadata("%s: Preparing PV label header %s size %" PRIu64 " with" + log_debug_metadata("%s: Preparing PV label header %s size " FMTu64 " with" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" @@ -352,7 +352,7 @@ static int _update_mda(struct metadata_area *mda, void *baton) mda_set_ignored(mda, rlocn_is_ignored(mdah->raw_locns)); if (mda_is_ignored(mda)) { - log_debug_metadata("Ignoring mda on device %s at offset %"PRIu64, + log_debug_metadata("Ignoring mda on device %s at offset " FMTu64, dev_name(mdac->area.dev), mdac->area.start); if (!dev_close(mdac->area.dev)) @@ -428,7 +428,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf, if (!(ext_version = xlate32(pvhdr_ext->version))) goto out; - log_debug_metadata("%s: PV header extension version %" PRIu32 " found", + log_debug_metadata("%s: PV header extension version " FMTu32 " found", dev_name(dev), ext_version); /* Extension version */

1 0

master - configure: Fix deprecation warning for lvmapp
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=75d4d8e9a42a4709ed403… Commit: 75d4d8e9a42a4709ed40348395b1e75dff4197e8 Parent: 2aedc98242cefd29a5eccabb600be6f37e756fda Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 15:20:48 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 15:20:48 2017 +0100 configure: Fix deprecation warning for lvmapp * and properly regenerate configure script --- configure | 6 +++--- configure.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 903ad6e..7e2969a 100755 --- a/configure +++ b/configure @@ -12777,8 +12777,8 @@ test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= if test "$APPLIB"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python bindings are deprecated. Use D-Bus API" >&5 -$as_echo "$as_me: WARNING: Python bindings are deprecated. Use D-Bus API" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: liblvm2app is deprecated. Use D-Bus API" >&5 +$as_echo "$as_me: WARNING: liblvm2app is deprecated. Use D-Bus API" >&2;} fi ################################################################################ @@ -13791,7 +13791,7 @@ fi PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes` PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir - PYTHON_BINDINGS=yes + test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes fi if test "$BUILD_LVMDBUSD" = yes; then diff --git a/configure.in b/configure.in index 85ddce0..88ee5ad 100644 --- a/configure.in +++ b/configure.in @@ -1455,7 +1455,7 @@ test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= AS_IF([test "$APPLIB"], - [AC_MSG_WARN([Python bindings are deprecated. Use D-Bus API])]) + [AC_MSG_WARN([liblvm2app is deprecated. Use D-Bus API])]) ################################################################################ dnl -- Enable cmdlib

1 0

master - lvmdbusd: Fix path to python3
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2aedc98242cefd29a5ecc… Commit: 2aedc98242cefd29a5eccabb600be6f37e756fda Parent: 6a6c8d7b81703205a283528da5b7b8630e32d0d0 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 12:36:54 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 12:36:54 2017 +0100 lvmdbusd: Fix path to python3 lvmdbusd executable script must use python3 interpreter detected by configure script, as site-packages directory used for library is only used by that interpreter. --- WHATS_NEW | 1 + configure | 3 ++- configure.in | 1 + daemons/lvmdbusd/.gitignore | 1 + daemons/lvmdbusd/lvmdbusd | 16 ---------------- daemons/lvmdbusd/lvmdbusd.in | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index db256b0..6f13fe3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Fix python3 path in lvmdbusd to use value detected by configure. Reduce checks for active LVs in vgchange before background polling. Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. diff --git a/configure b/configure index fc0a27a..903ad6e 100755 --- a/configure +++ b/configure @@ -15778,7 +15778,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaem on/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_ red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaem on/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service script s/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16488,6 +16488,7 @@ do "daemons/dmeventd/plugins/thin/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/thin/Makefile" ;; "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; + "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; "daemons/lvmdbusd/path.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/path.py" ;; "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;; "daemons/lvmpolld/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmpolld/Makefile" ;; diff --git a/configure.in b/configure.in index a0a47cd..85ddce0 100644 --- a/configure.in +++ b/configure.in @@ -2186,6 +2186,7 @@ daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile +daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile diff --git a/daemons/lvmdbusd/.gitignore b/daemons/lvmdbusd/.gitignore index 09375e7..c0f6b4e 100644 --- a/daemons/lvmdbusd/.gitignore +++ b/daemons/lvmdbusd/.gitignore @@ -1 +1,2 @@ path.py +lvmdbusd diff --git a/daemons/lvmdbusd/lvmdbusd b/daemons/lvmdbusd/lvmdbusd deleted file mode 100755 index 73d0f13..0000000 --- a/daemons/lvmdbusd/lvmdbusd +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -import sys -from lvmdbusd import main - -if __name__ == '__main__': - sys.exit(main()) diff --git a/daemons/lvmdbusd/lvmdbusd.in b/daemons/lvmdbusd/lvmdbusd.in new file mode 100755 index 0000000..bd84cd8 --- /dev/null +++ b/daemons/lvmdbusd/lvmdbusd.in @@ -0,0 +1,16 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import sys +from lvmdbusd import main + +if __name__ == '__main__': + sys.exit(main())

1 0

master - configure: applib is not required by dbusd
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6a6c8d7b81703205a2835… Commit: 6a6c8d7b81703205a283528da5b7b8630e32d0d0 Parent: a64c73a979062c097395735372bbb33456d445f2 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 12:12:42 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 12:12:42 2017 +0100 configure: applib is not required by dbusd --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 7d4f5b3..a0a47cd 100644 --- a/configure.in +++ b/configure.in @@ -1530,7 +1530,7 @@ if test "$PYTHON3_BINDINGS" = yes -o "$BUILD_LVMDBUSD" = yes; then PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes` PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir - PYTHON_BINDINGS=yes + test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes fi if test "$BUILD_LVMDBUSD" = yes; then

1 0

master - cleanup: debug message
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a64c73a979062c0973957… Commit: a64c73a979062c097395735372bbb33456d445f2 Parent: 700e2a2d251cf8dcaf56035e0bd83ce8f808b5c0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:17:15 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 cleanup: debug message --- tools/vgchange.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index ea737ba..616a9d3 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -124,8 +124,8 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, * If the LV is active exclusive remotely, * then ignore it here */ - log_verbose("%s/%s is exclusively active on" - " a remote node", vg->name, lv->name); + log_verbose("%s is exclusively active on a remote node.", + display_lvname(lv)); expected_count--; /* not accounted */ } continue; @@ -783,7 +783,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, if (!arg_is_set(cmd, refresh_ARG) && !vgchange_background_polling(cmd, vg)) - return_ECMD_FAILED; + return_ECMD_FAILED; return ret; }

1 0

master - cleanup: switch to standard query
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=700e2a2d251cf8dcaf560… Commit: 700e2a2d251cf8dcaf56035e0bd83ce8f808b5c0 Parent: 71485ebfc759299610e279a91b97215b556295df Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:15:21 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 cleanup: switch to standard query In /tools part we should mostly use standard functions lv_is_active* unless there is good reason to not use it. --- tools/vgchange.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index 48e64c5..ea737ba 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -58,19 +58,12 @@ static int _poll_lvs_in_vg(struct cmd_context *cmd, { struct lv_list *lvl; struct logical_volume *lv; - struct lvinfo info; - int lv_active; int count = 0; dm_list_iterate_items(lvl, &vg->lvs) { lv = lvl->lv; - if (!lv_info(cmd, lv, 0, &info, 0, 0)) - lv_active = 0; - else - lv_active = info.exists; - - if (lv_active && + if (lv_is_active_locally(lv) && (lv_is_pvmove(lv) || lv_is_converting(lv) || lv_is_merging(lv))) { lv_spawn_background_polling(cmd, lv); count++;

1 0

master - thin: regression fix for metadata checking
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=71485ebfc759299610e27… Commit: 71485ebfc759299610e279a91b97215b556295df Parent: 455b26b8dbdd05ec773a84da2ef64b669c80e194 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:09:45 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 thin: regression fix for metadata checking Fix regression from commit f173274fe4888cc73eb573cf2c6913f54641c1aa and restore support for 'disabled' checking via lvm.conf. --- lib/activate/dev_manager.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index ced50fa..2faf1cc 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1913,7 +1913,12 @@ static int _pool_callback(struct dm_tree_node *node, long buf[64 / sizeof(long)]; /* buffer for short disk header (64B) */ int args = 0; char *mpath; - const char *argv[19] = { 0 }; /* Max supported 15 args */ + const char *argv[19] = { /* Max supported 15 args */ + find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL) + }; + + if (!*argv[0]) /* *_check tool is unconfigured/disabled with "" setting */ + return 1; if (!(mpath = lv_dmpath_dup(data->dm->mem, mlv))) { log_error("Failed to build device path for checking pool metadata %s.", @@ -1947,9 +1952,6 @@ static int _pool_callback(struct dm_tree_node *node, } } - if (!(argv[0] = find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL))) - return 1; /* Checking disabled */ - if (!(cn = find_config_tree_array(mlv->vg->cmd, data->opts, NULL))) { log_error(INTERNAL_ERROR "Unable to find configuration for pool check options."); return 0;

1 0

master - activation: keep priority till memlock_unlock
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=455b26b8dbdd05ec773a8… Commit: 455b26b8dbdd05ec773a84da2ef64b669c80e194 Parent: 4e8af1d3aa136eae8dbb66186bfc331b0b2887e6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:11:35 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 activation: keep priority till memlock_unlock Although it doesn't look like it can be a measurable problem and costs some time to flip priorities outside of activation window. So just like with memory locking preserve priority until call memlock_unlock() appears. (addition to commit c086dfadc389551b9a2d7b4c26931e5e74ada8d6). --- lib/mm/memlock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index f72b86c..897bf10 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -627,8 +627,6 @@ void critical_section_dec(struct cmd_context *cmd, const char *reason) log_debug_activation("Leaving critical section (%s).", reason); } else log_debug_activation("Leaving section (%s).", reason); - - _restore_priority_if_possible(cmd); } int critical_section(void) @@ -683,6 +681,7 @@ void memlock_reset(void) void memlock_unlock(struct cmd_context *cmd) { _unlock_mem_if_possible(cmd); + _restore_priority_if_possible(cmd); } int memlock_count_daemon(void)

1 0

master - vgchange: drop extra counting
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4e8af1d3aa136eae8dbb6… Commit: 4e8af1d3aa136eae8dbb66186bfc331b0b2887e6 Parent: 14b1e5270dbca71870a79b37d6614e2cb96b180f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:17:34 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:14 2017 +0100 vgchange: drop extra counting As the loop for background polling _poll_lvs_in_vg checks for active LVs, avoid doing unnecessary extra check before. --- WHATS_NEW | 1 + tools/vgchange.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 4659d55..db256b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Reduce checks for active LVs in vgchange before background polling. Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. Report expected sanlock_convert errors only when retries fail. diff --git a/tools/vgchange.c b/tools/vgchange.c index ae97a4a..48e64c5 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -178,7 +178,7 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg { int polled; - if (lvs_in_vg_activated(vg) && background_polling()) { + if (background_polling()) { polled = _poll_lvs_in_vg(cmd, vg); if (polled) log_print_unless_silent("Background polling started for %d logical volume(s) "

1 0

master - format_text: Use explicit alignment in wrapping calc.
by Alasdair Kergon 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=14b1e5270dbca71870a79… Commit: 14b1e5270dbca71870a79b37d6614e2cb96b180f Parent: 4c88c4626d9870d4fa146f7596a37853cf965a39 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Dec 8 01:11:34 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Dec 8 01:18:46 2017 +0000 format_text: Use explicit alignment in wrapping calc. Expand out the metadata wrapping calculations to prepare to support a larger alignment. The current alignment is 512 bytes so (mdac_area_start + rlocn->offset) % alignment is zero. --- lib/format_text/format-text.c | 29 +++++++++++++++++------------ lib/format_text/layout.h | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 09ce693..c96fad9 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -472,19 +472,24 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, /* * Determine offset for uncommitted metadata */ -static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, - struct mda_header *mdah) +static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *mdah, uint64_t mdac_area_start, uint64_t alignment) { + uint64_t new_start_offset; + if (!rlocn) /* Find an empty slot */ /* FIXME Assume only one VG per mdah for now */ - return MDA_HEADER_SIZE; + return alignment; + + /* Calculate new start position within buffer rounded up to absolute alignment */ + new_start_offset = rlocn->offset + rlocn->size + + (alignment - (mdac_area_start + rlocn->offset + rlocn->size) % alignment); - /* Start of free space - round up to next sector; circular */ - return ((rlocn->offset + rlocn->size + - (SECTOR_SIZE - rlocn->size % SECTOR_SIZE) - - MDA_HEADER_SIZE) % (mdah->size - MDA_HEADER_SIZE)) - + MDA_HEADER_SIZE; + /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ + if (new_start_offset > mdah->size - MDA_HEADER_SIZE) + new_start_offset -= (mdah->size - MDA_HEADER_SIZE); + + return new_start_offset; } static int _raw_holds_vgname(struct format_instance *fid, @@ -643,9 +648,6 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) goto_out; - rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); - mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah); - if (!fidtc->raw_metadata_buf && !(fidtc->raw_metadata_buf_size = text_vg_export_raw(vg, "", &fidtc->raw_metadata_buf))) { @@ -653,6 +655,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto out; } + rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); + + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); mdac->rlocn.size = fidtc->raw_metadata_buf_size; if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) @@ -683,7 +688,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing wrapped metadata to %s at %" PRIu64 " len %" PRIu64, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index c88812f..1746b9c 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -102,6 +102,7 @@ struct mda_context { #define MDA_HEADER_SIZE 512 #define LVM2_LABEL "LVM2 001" #define MDA_SIZE_MIN (8 * (unsigned) lvm_getpagesize()) +#define MDA_ORIGINAL_ALIGNMENT 512 /* Original alignment used for start of VG metadata content */ int vgname_from_mda(const struct format_type *fmt, struct mda_header *mdah, int primary_mda, struct device_area *dev_area, struct lvmcache_vgsummary *vgsummary,

1 0

master - debug: update debug msg
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4c88c4626d9870d4fa146… Commit: 4c88c4626d9870d4fa146f7596a37853cf965a39 Parent: 717714b24ffbf648a1b22e9306484944a514c565 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:54:41 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 debug: update debug msg Use _node_name. --- libdm/libdm-deptree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 6ba20a4..98dda44 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -2786,9 +2786,9 @@ static int _dm_tree_revert_activated(struct dm_tree_node *parent) struct dm_tree_node *child; dm_list_iterate_items_gen(child, &parent->activated, activated_list) { - log_debug_activation("Reverting %s.", child->name); + log_debug_activation("Reverting %s.", _node_name(child)); if (child->callback) { - log_debug_activation("Dropping callback for %s.", child->name); + log_debug_activation("Dropping callback for %s.", _node_name(child)); child->callback = NULL; } if (!_deactivate_node(child->name, child->info.major, child->info.minor,

1 0

master - cleanup: use log_warn
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=717714b24ffbf648a1b22… Commit: 717714b24ffbf648a1b22e9306484944a514c565 Parent: f173274fe4888cc73eb573cf2c6913f54641c1aa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 10:42:30 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 cleanup: use log_warn --- libdm/libdm-common.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index f5c6062..2ab5bd1 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1917,13 +1917,13 @@ int dm_device_has_holders(uint32_t major, uint32_t minor) if (dm_snprintf(sysfs_path, PATH_MAX, "%sdev/block/%" PRIu32 ":%" PRIu32 "/holders", _sysfs_dir, major, minor) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); return 0; } if (stat(sysfs_path, &st)) { if (errno != ENOENT) - log_sys_error("stat", sysfs_path); + log_sys_debug("stat", sysfs_path); return 0; } @@ -1939,13 +1939,13 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) int r = 0; if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs", _sysfs_dir) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); return 0; } if (!(d = opendir(sysfs_path))) { if (errno != ENOENT) - log_sys_error("opendir", sysfs_path); + log_sys_debug("opendir", sysfs_path); return 0; } @@ -1955,7 +1955,7 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs/%s/%s", _sysfs_dir, dirent->d_name, kernel_dev_name) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); break; } @@ -1965,13 +1965,13 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) break; } else if (errno != ENOENT) { - log_sys_error("stat", sysfs_path); + log_sys_debug("stat", sysfs_path); break; } } if (closedir(d)) - log_error("_fs_present_on_device: %s: closedir failed", kernel_dev_name); + log_sys_debug("closedir", kernel_dev_name); return r; }

1 0

master - cleanup: reorder calling of pool checking tools
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f173274fe4888cc73eb57… Commit: f173274fe4888cc73eb573cf2c6913f54641c1aa Parent: 820b1b98fce4a370e9b54ffbc8cbe4b3d0e962f3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:49:15 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 cleanup: reorder calling of pool checking tools Test for zero header before even starting to create argument list for execution of thin/cache_check tool. --- lib/activate/dev_manager.c | 70 ++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 34 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index c050f34..ced50fa 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1912,11 +1912,42 @@ static int _pool_callback(struct dm_tree_node *node, const struct logical_volume *mlv = first_seg(pool_lv)->metadata_lv; long buf[64 / sizeof(long)]; /* buffer for short disk header (64B) */ int args = 0; - const char *argv[19] = { /* Max supported 15 args */ - find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL) /* argv[0] */ - }; + char *mpath; + const char *argv[19] = { 0 }; /* Max supported 15 args */ + + if (!(mpath = lv_dmpath_dup(data->dm->mem, mlv))) { + log_error("Failed to build device path for checking pool metadata %s.", + display_lvname(mlv)); + return 0; + } + + if (data->skip_zero) { + if ((fd = open(mpath, O_RDONLY)) < 0) { + log_sys_error("open", mpath); + return 0; + } + /* let's assume there is no problem to read 64 bytes */ + if (read(fd, buf, sizeof(buf)) < (int)sizeof(buf)) { + log_sys_error("read", mpath); + if (close(fd)) + log_sys_error("close", mpath); + return 0; + } + for (ret = 0; ret < (int) DM_ARRAY_SIZE(buf); ++ret) + if (buf[ret]) + break; + + if (close(fd)) + log_sys_error("close", mpath); + + if (ret == (int) DM_ARRAY_SIZE(buf)) { + log_debug_activation("Metadata checking skipped, detected empty disk header on %s.", + mpath); + return 1; + } + } - if (!*argv[0]) + if (!(argv[0] = find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL))) return 1; /* Checking disabled */ if (!(cn = find_config_tree_array(mlv->vg->cmd, data->opts, NULL))) { @@ -1939,36 +1970,7 @@ static int _pool_callback(struct dm_tree_node *node, return 0; } - if (!(argv[++args] = lv_dmpath_dup(data->dm->mem, mlv))) { - log_error("Failed to build pool metadata path."); - return 0; - } - - if (data->skip_zero) { - if ((fd = open(argv[args], O_RDONLY)) < 0) { - log_sys_error("open", argv[args]); - return 0; - } - /* let's assume there is no problem to read 64 bytes */ - if (read(fd, buf, sizeof(buf)) < (int)sizeof(buf)) { - log_sys_error("read", argv[args]); - if (close(fd)) - log_sys_error("close", argv[args]); - return 0; - } - for (ret = 0; ret < (int) DM_ARRAY_SIZE(buf); ++ret) - if (buf[ret]) - break; - - if (close(fd)) - log_sys_error("close", argv[args]); - - if (ret == (int) DM_ARRAY_SIZE(buf)) { - log_debug_activation("%s skipped, detect empty disk header on %s.", - argv[0], argv[args]); - return 1; - } - } + argv[++args] = mpath; if (!(ret = exec_cmd(pool_lv->vg->cmd, (const char * const *)argv, &status, 0))) {

1 0

master - libdm: drop extra structure copy
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=820b1b98fce4a370e9b54… Commit: 820b1b98fce4a370e9b54ffbc8cbe4b3d0e962f3 Parent: 82ae02bc6a6788aabb10ac8a95287feea37ab88c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:47:06 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 libdm: drop extra structure copy When doing resume, directly pass location where new updated info needs to be stored. _resume_node() ensures the info is ONLY updated when the function is successful and never changes it on error path. --- libdm/libdm-deptree.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 745fec3..6ba20a4 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1848,7 +1848,6 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, int resolvable_name_conflict, awaiting_peer_rename = 0; void *handle = NULL; struct dm_tree_node *child = dnode; - struct dm_info newinfo; const char *name; const char *uuid; int priority; @@ -1913,14 +1912,11 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, if (!_resume_node(child->name, child->info.major, child->info.minor, child->props.read_ahead, child->props.read_ahead_flags, - &newinfo, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { + &child->info, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { log_error("Unable to resume %s.", _node_name(child)); r = 0; continue; } - - /* Update cached info */ - child->info = newinfo; } if (awaiting_peer_rename) priority--; /* redo priority level */ @@ -2814,7 +2810,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, int r = 1, node_created = 0; void *handle = NULL; struct dm_tree_node *child; - struct dm_info newinfo; int update_devs_flag = 0; /* Preload children first */ @@ -2870,7 +2865,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, if (!_resume_node(child->name, child->info.major, child->info.minor, child->props.read_ahead, child->props.read_ahead_flags, - &newinfo, &child->dtree->cookie, child->udev_flags, + &child->info, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { log_error("Unable to resume %s.", _node_name(child)); /* If the device was not previously active, we might as well remove this node. */ @@ -2883,7 +2878,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, continue; } - if (!child->info.live_table) { + if (node_created) { /* Collect newly introduced devices for revert */ dm_list_add_h(&dnode->activated, &child->activated_list); @@ -2900,8 +2895,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, } } - /* Update cached info */ - child->info = newinfo; /* * Prepare for immediate synchronization with udev and flush all stacked * dev node operations if requested by immediate_dev_node property. But

1 0

master - libdm: use delay_resume_if_extended
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=82ae02bc6a6788aabb10a… Commit: 82ae02bc6a6788aabb10ac8a95287feea37ab88c Parent: 297d5915c3c927cba3a63bc9d6d1747271d06641 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 20:28:03 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 libdm: use delay_resume_if_extended Update the logic towards more explicit logic. Preload tree normally does not want to resume, only in certain cases of extension or new loaded nodes can be resumed. So introduce new internal variable delay_resume_if_extended controlable by target. Patch itself is not changing current existing behaviour, and rather documents existing problem in more readable way. lvm2 needs to introduce explicit mechanism how to support more fain-grained (and safe) logic to i.e. resize thin-pool which can be sitting on cached raid volume. --- libdm/libdm-deptree.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index f463eab..745fec3 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -233,6 +233,19 @@ struct load_properties { unsigned delay_resume_if_new; /* + * Preload tree normally only loads and not resume, but there is + * automatic resume when target is extended, as it's believed + * there can be no i/o flying to this 'new' extedend space + * from any device above. Reason is that preloaded target above + * may actually need to see its bigger subdevice before it + * gets suspended. As long as devices are simple linears + * there is no problem to resume bigger device in preload (before commit). + * However complex targets like thin-pool (raid,cache...) + * they shall not be resumed before their commit. + */ + unsigned delay_resume_if_extended; + + /* * Call node_send_messages(), set to 2 if there are messages * When != 0, it validates matching transaction id, thus thin-pools * where transation_id is passed as 0 are never validated, this @@ -2745,6 +2758,18 @@ static int _load_node(struct dm_tree_node *dnode) PRIu64 " for %s.%s", existing_table_size, seg_start, _node_name(dnode), dnode->props.size_changed ? "" : " (Ignoring.)"); + + /* + * FIXME: code here has known design problem. + * LVM2 does NOT resize thin-pool on top of other LV in 2 steps - + * where raid would be resized with 1st. transaction + * followed by 2nd. thin-pool resize - RHBZ #1285063 + */ + if (existing_table_size && dnode->props.delay_resume_if_extended) { + log_debug_activation("Resume of table of extended device %s delayed.", + _node_name(dnode)); + dnode->props.size_changed = 0; + } } } @@ -2791,7 +2816,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, struct dm_tree_node *child; struct dm_info newinfo; int update_devs_flag = 0; - struct load_segment *seg; /* Preload children first */ while ((child = dm_tree_next_child(&handle, dnode, 0))) { @@ -2816,6 +2840,10 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, if (!child->info.exists && !(node_created = _create_node(child))) return_0; + /* Propagate delayed resume from exteded child node */ + if (child->props.delay_resume_if_extended) + dnode->props.delay_resume_if_extended = 1; + if (!child->info.inactive_table && child->props.segment_count && !_load_node(child)) { @@ -2833,32 +2861,10 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, return_0; } - /* Propagate device size change change */ - if (child->props.size_changed > 0 && !dnode->props.size_changed) - dnode->props.size_changed = 1; - else if (child->props.size_changed < 0) - dnode->props.size_changed = -1; - /* No resume for a device without parents or with unchanged or smaller size */ if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0)) continue; - if (!node_created && (dm_list_size(&child->props.segs) == 1)) { - /* If thin-pool child nodes were preloaded WITH changed size - * skip device resume, as this is likely resize of data or - * metadata device and so thin pool needs suspend before - * resume operation. - * Note: child->props.segment_count is already 0 here - */ - seg = dm_list_item(dm_list_last(&child->props.segs), - struct load_segment); - if (seg->type == SEG_THIN_POOL) { - log_debug_activation("Skipping resume of thin-pool %s.", - child->name); - continue; - } - } - if (!child->info.inactive_table && !child->info.suspended) continue; @@ -3527,6 +3533,9 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, seg->metadata->props.delay_resume_if_new = 0; seg->pool->props.delay_resume_if_new = 0; + /* Preload must not resume extended running thin-pool before it's committed */ + node->props.delay_resume_if_extended = 1; + /* Validate only transaction_id > 0 when activating thin-pool */ node->props.send_messages = transaction_id ? 1 : 0; seg->transaction_id = transaction_id;

1 0

master - libdm: avoid checking status on activation
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=297d5915c3c927cba3a63… Commit: 297d5915c3c927cba3a63bc9d6d1747271d06641 Parent: 4a4ea47f709287444f3b0d8e0581ce17e730ef4c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:52:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:36 2017 +0100 libdm: avoid checking status on activation Variable props.send_messages has 3 states and was not used properly here. Activation in this moment does not need to verify thin-pool status as that has been already checked on preload. So only if there are some real messages (value 2) call function for sending them. --- WHATS_NEW_DM | 1 + libdm/libdm-deptree.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index dfa5a97..d9503c2 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.146 - ==================================== + Activation tree of thin pool skips duplicated check of pool status. Remove code supporting replicator target. Do not ignore failure of _info_by_dev(). Propagate delayed resume for pvmove subvolumes. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ef5da59..f463eab 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1920,7 +1920,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, * resume should continue further, just whole command * has to report failure. */ - if (r && dnode->props.send_messages && + if (r && (dnode->props.send_messages > 1) && !(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len, 1))) stack;

1 0

master - libdm: add help func _get_last_load_segment
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4a4ea47f709287444f3b0… Commit: 4a4ea47f709287444f3b0d8e0581ce17e730ef4c Parent: c3e224ad0ebd473268b171204c8985c9c642f590 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:23:37 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:37 2017 +0100 libdm: add help func _get_last_load_segment Share code for same functionality. --- libdm/libdm-deptree.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 1ef1700..ef5da59 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1485,6 +1485,16 @@ out: return r; } +static struct load_segment *_get_last_load_segment(struct dm_tree_node *node) +{ + if (dm_list_empty(&node->props.segs)) { + log_error("Node %s is missing a segment.", _node_name(node)); + return NULL; + } + + return dm_list_item(dm_list_last(&node->props.segs), struct load_segment); +} + /* For preload pass only validate pool's transaction_id */ static int _node_send_messages(struct dm_tree_node *dnode, const char *uuid_prefix, @@ -1497,10 +1507,12 @@ static int _node_send_messages(struct dm_tree_node *dnode, const char *uuid; int have_messages; - if (!dnode->info.exists || (dm_list_size(&dnode->props.segs) != 1)) + if (!dnode->info.exists) return 1; - seg = dm_list_item(dm_list_last(&dnode->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(dnode))) + return_0; + if (seg->type != SEG_THIN_POOL) return 1; @@ -3146,12 +3158,8 @@ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, struct dm_tree_node *log_node = NULL; struct load_segment *seg; - if (!node->props.segment_count) { - log_error(INTERNAL_ERROR "Attempt to add target area to missing segment."); - return 0; - } - - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; if (log_uuid) { if (!(seg->uuid = dm_pool_strdup(node->dtree->mem, log_uuid))) { @@ -3429,13 +3437,16 @@ static struct load_segment *_get_single_load_segment(struct dm_tree_node *node, { struct load_segment *seg; + if (!(seg = _get_last_load_segment(node))) + return_NULL; + + /* Never used past _load_node(), so can test segment_count */ if (node->props.segment_count != 1) { log_error("Node %s must have only one segment.", _dm_segtypes[type].target); return NULL; } - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); if (seg->type != type) { log_error("Node %s has segment type %s.", _dm_segtypes[type].target, @@ -3741,12 +3752,8 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node, return_0; } - if (!node->props.segment_count) { - log_error(INTERNAL_ERROR "Attempt to add target area to missing segment."); - return 0; - } - - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; if (!_add_area(node, seg, dev_node, offset)) return_0; @@ -3758,7 +3765,8 @@ int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset) { struct load_segment *seg; - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; switch (seg->type) { case SEG_RAID0:

1 0

master - thin: missing type is error
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c3e224ad0ebd473268b17… Commit: c3e224ad0ebd473268b171204c8985c9c642f590 Parent: 2208ebfe16e5b5cd54c762a5a06edd0681d62fa9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:21:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:37 2017 +0100 thin: missing type is error --- libdm/libdm-deptree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index b844a57..1ef1700 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1394,9 +1394,9 @@ static int _thin_pool_get_status(struct dm_tree_node *dnode, dm_get_next_target(dmt, NULL, &start, &length, &type, &params); - if (type && (strcmp(type, "thin-pool") != 0)) { + if (!type || (strcmp(type, "thin-pool") != 0)) { log_error("Expected thin-pool target for %s and got %s.", - _node_name(dnode), type); + _node_name(dnode), type ? : "no target"); goto out; }

1 0

master - thin: always clear memory before parsing status
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2208ebfe16e5b5cd54c76… Commit: 2208ebfe16e5b5cd54c762a5a06edd0681d62fa9 Parent: 2166d7be72c7371f0f94934625252646c5164a2c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:24:41 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:28 2017 +0100 thin: always clear memory before parsing status Ensure there cannot be 'reused' any data from some previous call. --- WHATS_NEW | 1 + libdm/libdm-deptree.c | 2 +- libdm/libdm-targets.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a5ec3e7..4659d55 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. Report expected sanlock_convert errors only when retries fail. Avoid blocking in sanlock_convert on SH to EX lock conversion. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 34a1547..b844a57 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1493,7 +1493,7 @@ static int _node_send_messages(struct dm_tree_node *dnode, { struct load_segment *seg; struct thin_message *tmsg; - struct dm_status_thin_pool stp = { 0 }; + struct dm_status_thin_pool stp; const char *uuid; int have_messages; diff --git a/libdm/libdm-targets.c b/libdm/libdm-targets.c index 6577f07..990d275 100644 --- a/libdm/libdm-targets.c +++ b/libdm/libdm-targets.c @@ -350,6 +350,8 @@ int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s) { int pos; + memset(s, 0, sizeof(*s)); + if (!params) { log_error("Failed to parse invalid thin params."); return 0; @@ -406,7 +408,7 @@ int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, { struct dm_status_thin_pool *s; - if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_thin_pool)))) { + if (!(s = dm_pool_alloc(mem, sizeof(struct dm_status_thin_pool)))) { log_error("Failed to allocate thin_pool status structure."); return 0; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits December 2017