lvm2-commits August 2015

lvm2-commits@lists.fedorahosted.org

7 participants
580 discussions

master - dmstats: don't output column headings when args checks fail
by Bryn Reeves 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=098528513f8c00d1… Commit: 098528513f8c00d12f4ca5b5e87e4a932a6ef4f6 Parent: 829384f46dedee8646cc6b098ef98463658c51d6 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Wed Aug 12 21:14:00 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Wed Aug 12 21:40:43 2015 +0100 dmstats: don't output column headings when args checks fail The clear, create, delete, and print commands do not use _report: make sure it is freed and set to NULL before checking arguments. --- tools/dmsetup.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 459639b..e913a7e 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -4193,6 +4193,12 @@ static int _stats_clear(CMD_ARGS) char *name = NULL; int allregions = _switches[ALL_REGIONS_ARG]; + /* clear does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + if (!_switches[REGION_ID_ARG] && !_switches[ALL_REGIONS_ARG]) { err("Please specify a region_id."); return 0; @@ -4206,12 +4212,6 @@ static int _stats_clear(CMD_ARGS) name = argv[1]; } - /* create does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - region_id = (allregions) ? DM_STATS_REGIONS_ALL : (uint64_t) _int_args[REGION_ID_ARG]; @@ -4327,6 +4327,12 @@ static int _stats_create(CMD_ARGS) uint64_t start = 0, len = 0, areas = 0, area_size = 0; int64_t step = 0; + /* create does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + if (_switches[ALL_REGIONS_ARG]) { log_error("Cannot use --allregions with create."); return 0; @@ -4363,12 +4369,6 @@ static int _stats_create(CMD_ARGS) name = argv[1]; } - /* create does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - if (_switches[AREAS_ARG]) areas = (uint64_t) _int_args[AREAS_ARG]; @@ -4443,6 +4443,12 @@ static int _stats_delete(CMD_ARGS) const char *program_id = DM_STATS_PROGRAM_ID; int allregions = _switches[ALL_REGIONS_ARG]; + /* delete does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + if (!_switches[REGION_ID_ARG] && !allregions) { err("Please specify a region_id."); return 0; @@ -4462,12 +4468,6 @@ static int _stats_delete(CMD_ARGS) name = argv[1]; } - /* delete does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - if (_switches[ALL_PROGRAMS_ARG]) program_id = DM_STATS_ALL_PROGRAMS; @@ -4598,6 +4598,12 @@ static int _stats_print(CMD_ARGS) unsigned clear = (unsigned) _switches[CLEAR_ARG]; int allregions = _switches[ALL_REGIONS_ARG]; + /* print does not use a report */ + if (_report) { + dm_report_free(_report); + _report = NULL; + } + if (!_switches[REGION_ID_ARG] && !allregions) { err("Please specify a region_id."); return 0; @@ -4611,12 +4617,6 @@ static int _stats_print(CMD_ARGS) name = argv[1]; } - /* print does not use a report */ - if (_report) { - dm_report_free(_report); - _report = NULL; - } - region_id = (uint64_t) _int_args[REGION_ID_ARG]; dms = dm_stats_create(DM_STATS_PROGRAM_ID);

1 0

master - config: description updates
by David Teigland 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=829384f46dedee86… Commit: 829384f46dedee8646cc6b098ef98463658c51d6 Parent: e96041e18fa5f8f0ccb50d31ee0b1c9fb6c5db21 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Aug 12 12:51:35 2015 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Aug 12 15:35:45 2015 -0500 config: description updates Make the first line of every description a complete one line sentence for the benefit of lvmconfig --withsummary. --- lib/config/config_settings.h | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 54a50ab..b687c57 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -122,8 +122,7 @@ cfg_section(devices_CFG_SECTION, "devices", root_CFG_SECTION, 0, vsn(1, 0, 0), 0 "How LVM uses block devices.\n") cfg_section(allocation_CFG_SECTION, "allocation", root_CFG_SECTION, CFG_PROFILABLE, vsn(2, 2, 77), 0, NULL, - "How LVM selects free space for Logical Volumes and default\n" - "properties applied to new Logical Volumes of various types.\n") + "How LVM selects space and applies properties to LVs.\n") cfg_section(log_CFG_SECTION, "log", root_CFG_SECTION, 0, vsn(1, 0, 0), 0, NULL, "How LVM log information is reported.\n") @@ -811,11 +810,11 @@ cfg(global_sparse_segtype_default_CFG, "sparse_segtype_default", global_CFG_SECT "The '--type snapshot|thin' option overrides this setting.\n") cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_path", global_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH, vsn(2, 2, 89), NULL, 0, NULL, + "Enable this to reinstate the previous lvdisplay name format.\n" "The default format for displaying LV names in lvdisplay was changed\n" "in version 2.02.89 to show the LV name and path separately.\n" "Previously this was always shown as /dev/vgname/lvname even when that\n" - "was never a valid path in the /dev filesystem.\n" - "Enable this option to reinstate the previous format.\n") + "was never a valid path in the /dev filesystem.\n") cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_USE_LVMETAD, vsn(2, 2, 93), "@DEFAULT_USE_LVMETAD@", 0, NULL, "Use lvmetad to cache metadata and reduce disk scanning.\n" @@ -1264,7 +1263,7 @@ cfg(activation_monitoring_CFG, "monitoring", activation_CFG_SECTION, 0, CFG_TYPE "The '--ignoremonitoring' option overrides this setting.\n") cfg(activation_polling_interval_CFG, "polling_interval", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_INTERVAL, vsn(2, 2, 63), NULL, 0, NULL, - "Check pvmove or lvconvert progress at this interval (seconds)\n" + "Check pvmove or lvconvert progress at this interval (seconds).\n" "When pvmove or lvconvert must wait for the kernel to finish\n" "synchronising or merging data, they check and report progress\n" "at intervals of this number of seconds.\n"

1 0

master - dmsetup: only free resources once in the final interval
by Bryn Reeves 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e96041e18fa5f8f0… Commit: e96041e18fa5f8f0ccb50d31ee0b1c9fb6c5db21 Parent: 0f45aa7f313e60e10aec6779e86f2179b8ac8865 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Wed Aug 12 19:16:05 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Wed Aug 12 19:16:05 2015 +0100 dmsetup: only free resources once in the final interval The _update_interval_times() function is called once per reported object: when shutting down at the end of a run only the first call should free timestamps. Clear the timestamp pointers after free and use this to signal to other callers that the clock is already shut down. --- tools/dmsetup.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 9876bd2..459639b 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -638,6 +638,12 @@ static int _update_interval_times(void) int r = 0; /* + * Clock shutdown for exit - nothing to do. + */ + if (_timer_fd == TIMER_STOPPED && !_cycle_timestamp) + return 1; + + /* * Current timestamp. If _new_interval is set this is used as * the new cycle start timestamp. */ @@ -717,6 +723,9 @@ out: if (_cycle_timestamp) dm_timestamp_destroy(_cycle_timestamp); dm_timestamp_destroy(this_timestamp); + + /* Clear timestamp pointers to signal shutdown. */ + _cycle_timestamp = this_timestamp = NULL; } return r; }

1 0

master - udev: fix missing escape for +
by Zdenek Kabelac 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0f45aa7f313e60e1… Commit: 0f45aa7f313e60e10aec6779e86f2179b8ac8865 Parent: 2cf3336130b01dc40e89bdd83fceabf057b4a03c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Aug 12 19:45:32 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 12 19:46:44 2015 +0200 udev: fix missing escape for + Commit 3ea396e9d220cec55fd4e139be7ae486cb4ddb91 missed to escape + which is used by 'sed' as separator for 's'. --- udev/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/udev/Makefile.in b/udev/Makefile.in index c4cc2bd..cd031ae 100644 --- a/udev/Makefile.in +++ b/udev/Makefile.in @@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\" endif ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes") -PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}+=\"lvm2-pvscan@\$$major:\$$minor.service\" +PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}\+=\"lvm2-pvscan@\$$major:\$$minor.service\" else PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\" endif

1 0

master - lvcreate: fix return value
by Zdenek Kabelac 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2cf3336130b01dc4… Commit: 2cf3336130b01dc40e89bdd83fceabf057b4a03c Parent: a8b9e2eccdfccd63bc8816cea66f157b0257e351 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Aug 12 14:53:00 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 12 19:46:43 2015 +0200 lvcreate: fix return value Return correct 0 instead of NULL. --- tools/lvcreate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index cc4ef20..2a94f3b 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -574,7 +574,7 @@ static int _read_cache_params(struct cmd_context *cmd, &lp->cache_mode, &lp->policy_name, &lp->policy_settings)) - return_NULL; + return_0; return 1; }

1 0

master - dmsetup: use timerfd for interval timing if available
by Bryn Reeves 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a8b9e2eccdfccd63… Commit: a8b9e2eccdfccd63bc8816cea66f157b0257e351 Parent: 99f55abc56bf1ce6b6f0e7d9cae67e347ace16b2 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Sat Aug 8 23:59:06 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Wed Aug 12 15:09:57 2015 +0100 dmsetup: use timerfd for interval timing if available If the Linux timerfd interface to POSIX timers is available at compile time use it for all report interval timekeeping. This gives more accurate interval timing when the per-interval processing time is less than the configured interval and simplifies the timestamp bookkeeping required to keep accurate time. For systems without timerfd support fall back to the simple usleep based timer. --- configure | 2 +- configure.in | 2 +- lib/misc/configure.h.in | 3 + tools/dmsetup.c | 325 +++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 290 insertions(+), 42 deletions(-) diff --git a/configure b/configure index b17e5a3..630f12a 100755 --- a/configure +++ b/configure @@ -5734,7 +5734,7 @@ fi done -for ac_header in termios.h sys/statvfs.h +for ac_header in termios.h sys/statvfs.h sys/timerfd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/configure.in b/configure.in index 243b634..c3e55e9 100644 --- a/configure.in +++ b/configure.in @@ -103,7 +103,7 @@ AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h \ sys/time.h sys/types.h sys/utsname.h sys/wait.h time.h \ unistd.h], , [AC_MSG_ERROR(bailing out)]) -AC_CHECK_HEADERS(termios.h sys/statvfs.h) +AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h) case "$host_os" in linux*) diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in index 750c75c..0adb7b1 100644 --- a/lib/misc/configure.h.in +++ b/lib/misc/configure.h.in @@ -516,6 +516,9 @@ /* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H +/* Define to 1 if you have the <sys/timerfd.h> header file. */ +#undef HAVE_SYS_TIMERFD_H + /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H diff --git a/tools/dmsetup.c b/tools/dmsetup.c index ed3cbd1..9876bd2 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -15,7 +15,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "tool.h" #include "dm-logging.h" @@ -49,6 +48,10 @@ # include <sys/ioctl.h> #endif +#if HAVE_SYS_TIMERFD_H +# include <sys/timerfd.h> +#endif + #if HAVE_TERMIOS_H # include <termios.h> #endif @@ -208,9 +211,15 @@ static uint64_t _disp_factor = 512; /* display sizes in sectors */ static char _disp_units = 's'; /* report timekeeping */ -static struct dm_timestamp *_ts_start = NULL, *_ts_end = NULL; -static uint64_t _last_interval = 0; /* approx. measured interval in nsecs */ +static struct dm_timestamp *_cycle_timestamp = NULL; static uint64_t _interval = 0; /* configured interval in nsecs */ +static uint64_t _new_interval = 0; /* flag top-of-interval */ +static uint64_t _last_interval = 0; /* approx. measured interval in nsecs */ +static double _mean_interval = 0.0; /* mean sample interval. */ +static int _timer_fd = -1; /* timerfd file descriptor. */ + +/* Invalid fd value used to signal end-of-reporting. */ +#define TIMER_STOPPED -2 #define NSEC_PER_USEC UINT64_C(1000) #define NSEC_PER_MSEC UINT64_C(1000000) @@ -456,9 +465,266 @@ static void _destroy_split_name(struct dm_split_name *split_name) dm_free(split_name); } +/* + * Stats clock: + * + * Use either Linux timerfds or usleep to implement the reporting + * interval wait. + * + * _start_timer() - Start the timer running. + * _do_timer_wait() - Wait until the beginning of the next interval. + * + * _update_interval_times() - Update timestamps and interval estimate. + */ + +#if HAVE_SYS_TIMERFD_H +static int _start_timerfd_timer(void) +{ + struct itimerspec interval_timer; + time_t secs; + long nsecs; + + log_debug("Using timerfd for interval timekeeping."); + + /* timer running? */ + if (_timer_fd != -1) + return 1; + + memset(&interval_timer, 0, sizeof(interval_timer)); + + /* Use CLOCK_MONOTONIC to avoid warp on RTC adjustments. */ + if ((_timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) < 0) { + log_error("Could not create timer: %s", strerror(errno)); + return 0; + } + + secs = (time_t) _interval / NSEC_PER_SEC; + nsecs = (long) _interval % NSEC_PER_SEC; + + /* Must set interval and value to create an armed periodic timer. */ + interval_timer.it_interval.tv_sec = secs; + interval_timer.it_interval.tv_nsec = nsecs; + interval_timer.it_value.tv_sec = secs; + interval_timer.it_value.tv_nsec = nsecs; + + log_debug("Setting interval timer to: "FMTu64"s "FMTu64"ns", secs, nsecs); + if (timerfd_settime(_timer_fd, 0, &interval_timer, NULL)) { + log_error("Could not set interval timer: %s", strerror(errno)); + return 0; + } + return 1; +} + +static int _do_timerfd_wait(void) +{ + uint64_t expired; + + if (_timer_fd < 0) + return 0; + + /* read on timerfd returns a uint64_t in host byte order. */ + if (read(_timer_fd, &expired, sizeof(expired)) < 0) { + /* EBADF from invalid timerfd or EINVAL from too small buffer. */ + log_error("Interval timer wait failed: %s", + strerror(errno)); + return 0; + } + + /* FIXME: attempt to rebase clock? */ + if (expired > 1) + log_warn("WARNING: Try increasing --interval ("FMTu64 + " missed timer events).", expired - 1); + + /* Signal that a new interval has begun. */ + _new_interval = 1; + + /* Final interval? */ + if (_count == 2) { + if (close(_timer_fd)) + stack; + /* Tell _update_interval_times() to shut down. */ + _timer_fd = TIMER_STOPPED; + } + + return 1; +} + +static int _start_timer(void) +{ + return _start_timerfd_timer(); +} + +static int _do_timer_wait(void) +{ + return _do_timerfd_wait(); +} + +#else /* !HAVE_SYS_TIMERFD_H */ +static int _start_usleep_timer(void) +{ + log_debug("Using usleep for interval timekeeping."); + return 1; +} + +static int _do_usleep_wait(void) +{ + static struct dm_timestamp *_last_sleep, *_now = NULL; + uint64_t this_interval; + int64_t delta_t; + + /* + * Report clock: compensate for time spent in userspace and stats + * message ioctls by keeping track of the last wake time and + * adjusting the sleep interval accordingly. + */ + if (!_last_sleep && !_now) { + if (!(_last_sleep = dm_timestamp_alloc())) + goto_out; + if (!(_now = dm_timestamp_alloc())) + goto_out; + dm_timestamp_get(_now); + this_interval = _interval; + log_error("Using "FMTu64" as first interval.", this_interval); + } else { + dm_timestamp_get(_now); + delta_t = dm_timestamp_delta(_now, _last_sleep); + log_debug("Interval timer delta_t: "FMTi64, delta_t); + + /* FIXME: usleep timer drift over large counts. */ + + /* adjust for time spent populating and reporting */ + this_interval = 2 * _interval - delta_t; + log_debug("Using "FMTu64" as interval.", this_interval); + } + + /* Signal that a new interval has begun. */ + _new_interval = 1; + dm_timestamp_copy(_last_sleep, _now); + + if (usleep(this_interval / NSEC_PER_USEC)) { + if (errno == EINTR) + log_error("Report interval interrupted by signal."); + if (errno == EINVAL) + log_error("Report interval too short."); + goto out; + } + + if(_count == 2) { + dm_timestamp_destroy(_last_sleep); + dm_timestamp_destroy(_now); + } + + return 1; +out: + return 0; +} + +static int _start_timer(void) +{ + return _start_usleep_timer(); +} + +static int _do_timer_wait(void) +{ + return _do_usleep_wait(); +} + +#endif /* HAVE_SYS_TIMERFD_H */ + +static int _update_interval_times(void) +{ + static struct dm_timestamp *this_timestamp = NULL; + uint64_t delta_t; + int r = 0; + + /* + * Current timestamp. If _new_interval is set this is used as + * the new cycle start timestamp. + */ + if (!this_timestamp) { + if (!(this_timestamp = dm_timestamp_alloc())) + return_0; + } + + /* + * Take cycle timstamp as close as possible to ioctl return. + * + * FIXME: use per-region timestamp deltas for interval estimate. + */ + if (!dm_timestamp_get(this_timestamp)) + goto_out; + + /* + * Stats clock: maintain a single timestamp taken just after the + * call to dm_stats_populate() and take a delta between the current + * and last value to determine the sampling interval. + * + * A new interval is started when the _new_interval flag is set + * on return from _do_report_wait(). + * + * The first interval is treated as a special case: since the + * time since the last clear of the counters is unknown (no + * previous timestamp exists) the duration is assumed to be the + * configured value. + */ + if (_cycle_timestamp) + /* Current delta_t: time from start of cycle to now. */ + delta_t = dm_timestamp_delta(this_timestamp, _cycle_timestamp); + else { + _cycle_timestamp = dm_timestamp_alloc(); + if (!_cycle_timestamp) { + log_error("Could not allocate timestamp object."); + goto out; + } + + /* Pretend we have the configured interval. */ + delta_t = _interval; + _mean_interval = (double) delta_t; + + /* start the first cycle */ + log_debug("Beginning first interval"); + _new_interval = 1; + } + + log_debug("Checking for interval end, dt="FMTu64, delta_t); + if (_new_interval) { + /* Update timestamp and interval and clear _new_interval */ + dm_timestamp_copy(_cycle_timestamp, this_timestamp); + _last_interval = delta_t; + _new_interval = 0; + + /* Track mean interval estimate. */ + _mean_interval = ((double) delta_t + _mean_interval) / 2.0; + + /* + * Log interval duration, mean interval, the last interval + * error and the difference between the mean and configured + * intervals. + */ + log_debug("Ending interval, I="FMTu64" Imean=%f, Ierr="FMTi64 + ", Emean=%.2f", _last_interval, _mean_interval, + ((int64_t)_last_interval - (int64_t)_interval), + _mean_interval - (double) _interval); + } + + r = 1; + +out: + if (!r || _timer_fd == TIMER_STOPPED) { + /* The _cycle_timestamp has not yet been allocated if we + * fail to obtain this_timestamp on the first interval. + */ + if (_cycle_timestamp) + dm_timestamp_destroy(_cycle_timestamp); + dm_timestamp_destroy(this_timestamp); + } + return r; +} + static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) { struct dmsetup_report_obj obj; + int r = 0; if (!info->exists) { @@ -497,13 +763,17 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) goto_out; - /* FIXME: use a single timestamp to measure _last_interval. */ - dm_stats_set_sampling_interval_ns(obj.stats, _last_interval); - dm_stats_bind_devno(obj.stats, info->major, info->minor); - if (!(dm_stats_populate(obj.stats, DM_STATS_PROGRAM_ID, DM_STATS_REGIONS_ALL))) { + + if (!(dm_stats_populate(obj.stats, DM_STATS_PROGRAM_ID, DM_STATS_REGIONS_ALL))) goto out; - } + + /* Update timestamps and handle end-of-interval accounting. */ + _update_interval_times(); + + log_debug("Setting interval, I="FMTu64, _last_interval); + /* use measured approximation for calculations */ + dm_stats_set_sampling_interval_ns(obj.stats, _last_interval); } /* @@ -5416,26 +5686,7 @@ static int _perform_command_for_all_repeatable_args(CMD_ARGS) static int _do_report_wait(void) { - if (!dm_timestamp_get(_ts_start)) - goto_out; - - /* FIXME: compensate for interval drift from time spent reporting. */ - if (usleep((useconds_t) (_interval / NSEC_PER_USEC))) { - if (errno == EINTR) - log_error("Report interval interrupted by signal."); - if (errno == EINVAL) - log_error("Report interval too short."); - goto out; - } - - if (!dm_timestamp_get(_ts_end)) - goto_out; - - _last_interval = dm_timestamp_delta(_ts_end, _ts_start); - - return 1; -out: - return 0; + return _do_timer_wait(); } int main(int argc, char **argv) @@ -5553,14 +5804,11 @@ unknown: argc--, argv++; } - _ts_start = dm_timestamp_alloc(); - _ts_end = dm_timestamp_alloc(); - if (!_ts_start || !_ts_end) { - log_error("Could not allocate timestamp objects."); - goto out; - } - /* Pretend we have the configured interval for the first iteration. */ - _last_interval = _interval; + /* Start interval timer. */ + if (_count > 1) + if (!_start_timer()) + goto_out; + doit: multiple_devices = (cmd->repeatable_cmd && argc != 2 && (argc != 1 || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); @@ -5581,19 +5829,16 @@ doit: goto_out; } } - } while (--_count); out: + if (_report) dm_report_free(_report); if (_dtree) dm_tree_free(_dtree); - dm_timestamp_destroy(_ts_start); - dm_timestamp_destroy(_ts_end); - dm_free(_table); if (_initial_timestamp)

1 0

master - libdm: add dm_timestamp_copy()
by Bryn Reeves 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=99f55abc56bf1ce6… Commit: 99f55abc56bf1ce6b6f0e7d9cae67e347ace16b2 Parent: c2d814e78d17320a557c1c0fe40440cda896ea2d Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Fri Aug 7 13:09:56 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Wed Aug 12 15:09:57 2015 +0100 libdm: add dm_timestamp_copy() --- libdm/.exported_symbols.DM_1_02_104 | 1 + libdm/libdevmapper.h | 5 +++++ libdm/libdm-timestamp.c | 5 +++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libdm/.exported_symbols.DM_1_02_104 b/libdm/.exported_symbols.DM_1_02_104 index 712fcf2..411ab2a 100644 --- a/libdm/.exported_symbols.DM_1_02_104 +++ b/libdm/.exported_symbols.DM_1_02_104 @@ -72,6 +72,7 @@ dm_task_get_ioctl_timestamp dm_task_set_record_timestamp dm_timestamp_alloc dm_timestamp_compare +dm_timestamp_copy dm_timestamp_delta dm_timestamp_destroy dm_timestamp_get diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 18df90a..192fd0f 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -2183,6 +2183,11 @@ struct dm_timestamp *dm_timestamp_alloc(void); int dm_timestamp_get(struct dm_timestamp *ts); /* + * Copy a timestamp from ts_old to ts_new. + */ +void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old); + +/* * Compare two timestamps. * * Return: -1 if ts1 is less than ts2 diff --git a/libdm/libdm-timestamp.c b/libdm/libdm-timestamp.c index fe006d5..3e01442 100644 --- a/libdm/libdm-timestamp.c +++ b/libdm/libdm-timestamp.c @@ -168,6 +168,11 @@ uint64_t dm_timestamp_delta(struct dm_timestamp *ts1, struct dm_timestamp *ts2) return t2 - t1; } +void dm_timestamp_copy(struct dm_timestamp *ts_new, struct dm_timestamp *ts_old) +{ + *ts_new = *ts_old; +} + void dm_timestamp_destroy(struct dm_timestamp *ts) { dm_free(ts);

1 0

master - tests: keep testing mq policy
by Zdenek Kabelac 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c2d814e78d17320a… Commit: c2d814e78d17320a557c1c0fe40440cda896ea2d Parent: 9e3ef2809a83c55131932cbd33b8de0138b590b4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Aug 12 14:18:28 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 12 14:33:16 2015 +0200 tests: keep testing mq policy Tests were written for 'mq' policy, so disable smq. --- test/shell/lvchange-cache.sh | 2 ++ test/shell/lvconvert-cache-raid.sh | 2 ++ test/shell/lvcreate-cache.sh | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/test/shell/lvchange-cache.sh b/test/shell/lvchange-cache.sh index 9ce0314..3efd762 100644 --- a/test/shell/lvchange-cache.sh +++ b/test/shell/lvchange-cache.sh @@ -16,6 +16,8 @@ test -e LOCAL_LVMPOLLD && skip aux have_cache 1 3 0 || skip aux prepare_vg 3 +aux lvmconf 'global/cache_disabled_features = [ "policy_smq" ]' + lvcreate --type cache-pool -an -v -L 2 -n cpool $vg lvcreate -H -L 4 -n corigin --cachepool $vg/cpool lvcreate -n noncache -l 1 $vg diff --git a/test/shell/lvconvert-cache-raid.sh b/test/shell/lvconvert-cache-raid.sh index b8333d9..5f51fee 100644 --- a/test/shell/lvconvert-cache-raid.sh +++ b/test/shell/lvconvert-cache-raid.sh @@ -18,6 +18,8 @@ test -e LOCAL_LVMPOLLD && skip aux have_cache 1 3 0 || skip aux have_raid 1 0 0 || skip +aux lvmconf 'global/cache_disabled_features = [ "policy_smq" ]' + aux prepare_vg 5 80 # Bug 1095843 diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh index aa0ab53..b921909 100644 --- a/test/shell/lvcreate-cache.sh +++ b/test/shell/lvcreate-cache.sh @@ -23,6 +23,7 @@ aux have_cache 1 3 0 || skip # FIXME: parallel cache metadata allocator is crashing when used value 8000! aux prepare_vg 5 80000 +aux lvmconf 'global/cache_disabled_features = [ "policy_smq" ]' ####################### # Cache_Pool creation #

1 0

master - tests: link some new cache profiles
by Zdenek Kabelac 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9e3ef2809a83c551… Commit: 9e3ef2809a83c55131932cbd33b8de0138b590b4 Parent: 48ed8ac50cd0c384c3ff4e5e7dbc79b8f1c24cef Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jul 20 11:56:11 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 12 14:33:16 2015 +0200 tests: link some new cache profiles --- test/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 65ba294..2119509 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -199,7 +199,8 @@ install: .tests-stamp lib/paths-installed $(INSTALL_PROGRAM) api/*.{t,py} $(DATADIR)/api/ $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths $(INSTALL_DATA) $(LIB_FLAVOURS) $(DATADIR)/lib/ - $(INSTALL_DATA) $(abs_top_srcdir)/conf/thin-performance.profile $(DATADIR)/lib/thin-performance.profile + for i in cache-mq cache-smq thin-performance ; do \ + $(INSTALL_DATA) $(abs_top_srcdir)/conf/$$i.profile $(DATADIR)/lib/$$i.profile; done $(INSTALL_SCRIPT) $(LIB_SHARED) $(DATADIR)/lib/ for i in $(CMDS); do (cd $(DATADIR)/lib && $(LN_S) -f lvm-wrapper $$i); done

1 0

master - cleanup: indent
by Zdenek Kabelac 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=48ed8ac50cd0c384… Commit: 48ed8ac50cd0c384c3ff4e5e7dbc79b8f1c24cef Parent: ece758457de0c5a40b5b33b90cab2238de34d55e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jul 21 11:18:42 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 12 14:33:16 2015 +0200 cleanup: indent --- lib/cache_segtype/cache.c | 4 ++-- lib/metadata/lv_manip.c | 3 ++- libdm/libdm-deptree.c | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index 53c867e..85cba18 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -170,8 +170,8 @@ static void _destroy(struct segment_type *segtype) #ifdef DEVMAPPER_SUPPORT static int _target_present(struct cmd_context *cmd, - const struct lv_segment *seg __attribute__((unused)), - unsigned *attributes __attribute__((unused))) + const struct lv_segment *seg __attribute__((unused)), + unsigned *attributes __attribute__((unused))) { /* List of features with their kernel target version */ static const struct feature { diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 116f099..c192d1b 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6998,7 +6998,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (seg_is_pool(lp)) status |= LVM_WRITE; /* Pool is always writable */ - else if (seg_is_cache(lp) || seg_is_thin_volume(lp)) { + else if (seg_is_cache(lp) || seg_is_thin_volume(lp)) { /* Resolve pool volume */ if (!lp->pool_name) { /* Should be already checked */ @@ -7222,6 +7222,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!archive(vg)) return_NULL; + if (pool_lv && seg_is_thin_volume(lp)) { /* Ensure all stacked messages are submitted */ if ((pool_is_active(pool_lv) || is_change_activating(lp->activate)) && diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 040a826..d28f0de 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -3405,7 +3405,6 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node, if (!_link_tree_nodes(node, seg->metadata)) return_0; - if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree, origin_uuid))) { log_error("Missing cache's origin uuid %s.", @@ -3434,7 +3433,6 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node, } } - return 1; }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2015