May 2015 - lvm2-commits - Fedora Mailing-Lists

by Zdenek Kabelac

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13e87045fdca70... Commit: 13e87045fdca702e727fe287d66aaf2035cb6318 Parent: 9c2a6de68f776be2b6839960d955c75e749ccc0c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 11 21:47:39 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 12 12:40:37 2015 +0200 makefiles: use LN_S --- test/Makefile.in | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 91805c2..bf34201 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 Red Hat, Inc. All rights reserved. +# Copyright (C) 2007-2015 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -179,20 +179,20 @@ install: .tests-stamp lib/paths-installed $(INSTALL_DATA) $(LIB_FLAVOURS) $(DATADIR)/lib/ $(INSTALL_DATA) $(abs_top_srcdir)/conf/thin-performance.profile $(DATADIR)/lib/thin-performance.profile $(INSTALL_SCRIPT) $(LIB_SHARED) $(DATADIR)/lib/ - for i in $(CMDS); do (cd $(DATADIR)/lib && ln -fs lvm-wrapper $$i); done + for i in $(CMDS); do (cd $(DATADIR)/lib && $(LN_S) -f lvm-wrapper $$i); done $(INSTALL_DIR) $(EXECDIR) $(INSTALL_PROGRAM) $(LIB_EXEC) $(EXECDIR) $(INSTALL_PROGRAM) -D lib/runner $(bindir)/lvm2-testsuite lib/should: lib/not - ln -sf not lib/should + $(LN_S) -f not lib/should lib/invalid: lib/not - ln -sf not lib/invalid + $(LN_S) -f not lib/invalid lib/fail: lib/not - ln -sf not lib/fail + $(LN_S) -f not lib/fail lib/runner: lib/runner.o .lib-dir-stamp $(CXX) $(LDFLAGS) -o $@ $< @@ -253,7 +253,7 @@ LIB = $(LIB_SHARED) $(LIB_LOCAL) $(LIB_EXEC) $(LIB_FLAVOURS) echo "Linking tests to builddir."; \ $(MKDIR_P) shell; \ for f in $(subst $(srcdir)/,,$(ALL)); do \ - ln -sf $(abs_top_srcdir)/test/$$f $$f; \ + $(LN_S) -f $(abs_top_srcdir)/test/$$f $$f; \ done; \ fi @$(MKDIR_P) -m a=rwx $(LVM_TEST_RESULTS) @@ -261,15 +261,15 @@ LIB = $(LIB_SHARED) $(LIB_LOCAL) $(LIB_EXEC) $(LIB_FLAVOURS) .lib-dir-stamp: $(MKDIR_P) lib - for i in $(CMDS); do ln -fs lvm-wrapper lib/$$i; done - ln -fs $(abs_top_builddir)/tools/dmsetup lib/dmsetup - ln -fs $(abs_top_builddir)/daemons/clvmd/clvmd lib/clvmd - ln -fs $(abs_top_builddir)/daemons/dmeventd/dmeventd lib/dmeventd - ln -fs $(abs_top_builddir)/daemons/lvmetad/lvmetad lib/lvmetad - ln -fs $(abs_top_builddir)/daemons/lvmpolld/lvmpolld lib/lvmpolld - ln -fs $(abs_top_srcdir)/scripts/vgimportclone.sh lib/vgimportclone - ln -fs $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm - ln -fs $(abs_top_srcdir)/conf/thin-performance.profile lib/thin-performance.profile + for i in $(CMDS); do $(LN_S) -f lvm-wrapper lib/$$i; done + $(LN_S) -f $(abs_top_builddir)/tools/dmsetup lib/dmsetup + $(LN_S) -f $(abs_top_builddir)/daemons/clvmd/clvmd lib/clvmd + $(LN_S) -f $(abs_top_builddir)/daemons/dmeventd/dmeventd lib/dmeventd + $(LN_S) -f $(abs_top_builddir)/daemons/lvmetad/lvmetad lib/lvmetad + $(LN_S) -f $(abs_top_builddir)/daemons/lvmpolld/lvmpolld lib/lvmpolld + $(LN_S) -f $(abs_top_srcdir)/scripts/vgimportclone.sh lib/vgimportclone + $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm + $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/thin-performance.profile touch $@ cleantest:

9 years

1
0
0 / 0

master - makefiles: runtime spec.inc

by Zdenek Kabelac

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c2a6de68f776b... Commit: 9c2a6de68f776be2b6839960d955c75e749ccc0c Parent: f5199a1cbddf9fbfaba54635c12b7ebd6e4dd0a8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 11 21:48:11 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 12 12:40:37 2015 +0200 makefiles: runtime spec.inc Support CLEAN_DIRS Var for rpmbuilddir Use LN_S Generate spec.inc at runtime for 'make rpm'. --- Makefile.in | 37 +++++++++++++++++++++++-------------- WHATS_NEW | 1 + make.tmpl.in | 2 ++ 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index a180d10..be4241c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,24 +99,33 @@ check check_system check_cluster check_local check_lvmetad unit: all conf.generate: tools -VER = LVM2.@LVM_MAJOR@.@LVM_MINOR@.(a)LVM_PATCHLEVEL@ -CLEAN_TARGETS += $(VER).tgz -clean: - $(RM) -r build +# how to use parenthesis in makefiles +leftparen:=( +LVM_VER := $(firstword $(subst $(leftparen), ,$(LVM_VERSION))) +VER := LVM2.$(LVM_VER) +# release file name +FILE_VER := $(VER).tgz +CLEAN_TARGETS += $(FILE_VER) +CLEAN_DIRS += $(rpmbuilddir) dist: - @echo "Generating $(VER).tgz";\ - git ls-tree -r HEAD --name-only | xargs tar --transform "s,^,$(VER)/," -zcf $(VER).tgz + @echo "Generating $(FILE_VER)";\ + (cd $(top_srcdir); git ls-tree -r HEAD --name-only | xargs tar --transform "s,^,$(VER)/," -c) | gzip >$(FILE_VER) rpm: dist - $(MKDIR_P) build/SPECS build/SOURCES - ln -sf $(abs_top_srcdir)/spec/lvm2.spec build/SPECS - ln -sf $(abs_top_srcdir)/spec/build.inc build/SOURCES - ln -sf $(abs_top_srcdir)/spec/macros.inc build/SOURCES - ln -sf $(abs_top_srcdir)/spec/packages.inc build/SOURCES - ln -sf $(abs_top_srcdir)/spec/source.inc build/SOURCES - ln -sf $(abs_top_builddir)/$(VER).tgz build/SOURCES - rpmbuild -v --define "_topdir $(abs_top_builddir)/build" -ba build/SPECS/lvm2.spec + $(RM) -r $(rpmbuilddir)/SOURCES + $(MKDIR_P) $(rpmbuilddir)/SOURCES + $(LN_S) -f $(abs_top_builddir)/$(FILE_VER) $(rpmbuilddir)/SOURCES + $(LN_S) -f $(abs_top_srcdir)/spec/build.inc $(rpmbuilddir)/SOURCES + $(LN_S) -f $(abs_top_srcdir)/spec/macros.inc $(rpmbuilddir)/SOURCES + $(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES + DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\ + GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\ + sed -e "s,$device_mapper_version$ [0-9.]*$$,\1 $$DM_VER," \ + -e "s,^$Version:[^0-9%]*$[0-9.]*$$,\1 $(LVM_VER)," \ + -e "s,^$Release:[^0-9%]*$[0-9.]\+,\1 $$GIT_VER," \ + $(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc + rpmbuild -v --define "_topdir $(abs_top_builddir)/$(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec generate: conf.generate $(MAKE) -C conf generate diff --git a/WHATS_NEW b/WHATS_NEW index e4fe6b6..d724a1b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.120 - =============================== + Provide make dist and make rpm targets Configure lvm.conf for use_lvmetad and use_lvmpolld. Add lvpoll for cmdline communication with lvmpolld. Add lvmpolld acting as a free-standing version of polldaemon. diff --git a/make.tmpl.in b/make.tmpl.in index 1cac75e..dce5b2c 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -116,6 +116,7 @@ vpath %.exported_symbols $(srcdir) interface = @interface@ interfacebuilddir = $(top_builddir)/libdm/$(interface) +rpmbuilddir = build # The number of jobs to run, if blank, defaults to the make standard ifndef MAKEFLAGS @@ -465,6 +466,7 @@ $(LIB_STATIC): $(OBJECTS) $(MSGFMT) -o $@ $< cleandir: + test -z "$(CLEAN_DIRS)" || $(RM) -r $(CLEAN_DIRS) $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(CLEAN_CFLOW) $(LDDEPS) \ $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \ $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \

9 years

1
0
0 / 0

master - tests: remove forgotten set -v in aux

by okozina

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f5199a1cbddf9f... Commit: f5199a1cbddf9fbfaba54635c12b7ebd6e4dd0a8 Parent: d7581157861722b832afd17f83a71f993a9e44a0 Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Mon May 11 18:49:24 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Mon May 11 19:08:19 2015 +0200 tests: remove forgotten set -v in aux --- test/lib/aux.sh | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index ef25117..fedf726 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -137,7 +137,6 @@ notify_lvmetad() { } prepare_lvmpolld() { - set -x rm -f debug.log # skip if we don't have our own lvmpolld... (which lvmpolld 2>/dev/null | grep "$abs_builddir") || skip

9 years

1
0
0 / 0

master - lvmpolld: by default spawn lvpoll cmd with -An

by okozina

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d7581157861722... Commit: d7581157861722b832afd17f83a71f993a9e44a0 Parent: 5cfd7074afb03c4e34ced4008e0d706d9f4b36ba Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Mon May 11 15:22:18 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Mon May 11 19:08:13 2015 +0200 lvmpolld: by default spawn lvpoll cmd with -An --- daemons/lvmpolld/lvmpolld-cmd-utils.c | 4 ++++ tools/commands.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/daemons/lvmpolld/lvmpolld-cmd-utils.c b/daemons/lvmpolld/lvmpolld-cmd-utils.c index cd789a3..0248221 100644 --- a/daemons/lvmpolld/lvmpolld-cmd-utils.c +++ b/daemons/lvmpolld/lvmpolld-cmd-utils.c @@ -86,6 +86,10 @@ const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary, if (!add_to_cmd_arr(&cmd_argv, pdlv->lvname, &i)) goto err; + /* disable metadata backup */ + if (!add_to_cmd_arr(&cmd_argv, "-An", &i)) + goto err; + /* terminating NULL */ if (!add_to_cmd_arr(&cmd_argv, NULL, &i)) goto err; diff --git a/tools/commands.h b/tools/commands.h index 2e53d8f..bbfcd72 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -886,6 +886,7 @@ xx(lvpoll, "\t[--abort]\n" "\t[--handlemissingpvs]\n" "\t[--polloperation\n" + "\t[-A|--autobackup {y|n}]\n" "\t[-d|--debug]\n " "\t[-h|-?|--help]\n" "\t[-i|--interval seconds]\n" @@ -893,7 +894,7 @@ xx(lvpoll, "\t[-v|--verbose]\n " "\t[--version]\n", - abort_ARG, handlemissingpvs_ARG, interval_ARG, polloperation_ARG, + abort_ARG, autobackup_ARG, handlemissingpvs_ARG, interval_ARG, polloperation_ARG, test_ARG) xx(pvremove,

9 years

1
0
0 / 0

master - lvmpolld: set use counters properly in lvmpolld_store

by okozina

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5cfd7074afb03c... Commit: 5cfd7074afb03c4e34ced4008e0d706d9f4b36ba Parent: 5e0a8fa981d9e9d76be565482e4c0d225ff4cb60 Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Mon May 11 14:19:11 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Mon May 11 19:08:00 2015 +0200 lvmpolld: set use counters properly in lvmpolld_store set active_polling_count to zero in pdst_init fn --- daemons/lvmpolld/lvmpolld-data-utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemons/lvmpolld/lvmpolld-data-utils.c b/daemons/lvmpolld/lvmpolld-data-utils.c index 92147df..0720718 100644 --- a/daemons/lvmpolld/lvmpolld-data-utils.c +++ b/daemons/lvmpolld/lvmpolld-data-utils.c @@ -203,6 +203,7 @@ struct lvmpolld_store *pdst_init(const char *name) goto err_mutex; pdst->name = name; + pdst->active_polling_count = 0; return pdst;

9 years

1
0
0 / 0

master - lib/polldaemon.h: remove trailing whitespace

by okozina

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5e0a8fa981d9e9... Commit: 5e0a8fa981d9e9d76be565482e4c0d225ff4cb60 Parent: 2bbf0425e7cb40984173c91486fef6413a075f20 Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Mon May 11 13:39:16 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Mon May 11 19:07:55 2015 +0200 lib/polldaemon.h: remove trailing whitespace --- lib/lvmpolld/polldaemon.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/lvmpolld/polldaemon.h b/lib/lvmpolld/polldaemon.h index 6309a5f..2c7ce4b 100644 --- a/lib/lvmpolld/polldaemon.h +++ b/lib/lvmpolld/polldaemon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. * * This file is part of LVM2.

9 years

1
0
0 / 0

master - lvmdump.sh: print out lvmpolld service status

by okozina

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2bbf0425e7cb40... Commit: 2bbf0425e7cb40984173c91486fef6413a075f20 Parent: 5420edd56ecc3547758109cc87d0530d1e2e56d7 Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Mon May 11 13:31:43 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Mon May 11 19:07:47 2015 +0200 lvmdump.sh: print out lvmpolld service status --- scripts/lvmdump.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/lvmdump.sh b/scripts/lvmdump.sh index 879dd0c..f88f31f 100755 --- a/scripts/lvmdump.sh +++ b/scripts/lvmdump.sh @@ -239,7 +239,6 @@ if (( $metadata )); then done fi -# FIXME: add lvmpolld.service here if (( $sysreport )); then myecho "Gathering system info..." @@ -259,6 +258,7 @@ if (( $sysreport )); then log "$SYSTEMCTL status -l --no-pager -n $log_lines -o short-precise dm-event.socket dm-event.service \ lvm2-monitor.service \ lvm2-lvmetad.socket lvm2-lvmetad.service \ + lvm2-lvmpolld.socket lvm2-lvmpolld.service \ lvm2-cluster-activation.service \ lvm2-clvmd.service \ lvm2-cmirrord.service \

9 years

1
0
0 / 0

master - tests: split flavours

by Zdenek Kabelac

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5420edd56ecc35... Commit: 5420edd56ecc3547758109cc87d0530d1e2e56d7 Parent: e28ff7e0fcac221edc9289420fbc8ecb5a4a3707 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 11 17:30:23 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 11 17:31:09 2015 +0200 tests: split flavours Remove duplicate flavour-udev-lvmetad-lvmpolld and put them 1-per-line. --- test/Makefile.in | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 051a38e..91805c2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -150,11 +150,19 @@ endif DATADIR = $(datadir)/lvm2-testsuite EXECDIR = $(libexecdir)/lvm2-testsuite -LIB_FLAVOURS = lib/flavour-ndev-vanilla lib/flavour-ndev-cluster lib/flavour-ndev-lvmetad \ - lib/flavour-udev-vanilla lib/flavour-udev-cluster lib/flavour-udev-lvmetad \ - lib/flavour-udev-lvmpolld lib/flavour-ndev-lvmpolld lib/flavour-ndev-cluster-lvmpolld \ - lib/flavour-ndev-lvmetad-lvmpolld lib/flavour-udev-lvmpolld lib/flavour-udev-cluster-lvmpolld \ - lib/flavour-udev-lvmetad-lvmpolld +LIB_FLAVOURS = \ + lib/flavour-ndev-cluster-lvmpolld\ + lib/flavour-ndev-cluster\ + lib/flavour-ndev-lvmetad-lvmpolld\ + lib/flavour-ndev-lvmetad\ + lib/flavour-ndev-lvmpolld\ + lib/flavour-ndev-vanilla\ + lib/flavour-udev-cluster-lvmpolld\ + lib/flavour-udev-cluster\ + lib/flavour-udev-lvmetad-lvmpolld\ + lib/flavour-udev-lvmetad\ + lib/flavour-udev-lvmpolld\ + lib/flavour-udev-vanilla LIB_LOCAL = lib/paths lib/runner LIB_EXEC = lib/not lib/invalid lib/fail lib/should

9 years

1
0
0 / 0

master - nix: now some files are generate so keep them

by Zdenek Kabelac

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e28ff7e0fcac22... Commit: e28ff7e0fcac221edc9289420fbc8ecb5a4a3707 Parent: d748b3455d25192d68e166d89d1c6f67ac226d44 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 11 17:29:21 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 11 17:31:09 2015 +0200 nix: now some files are generate so keep them more tweaks ahead --- nix/default.nix | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index a1cc98f..b1693af 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -194,7 +194,7 @@ let echo "* `date +"%a %b %d %Y"` Petr Rockai <prockai(a)redhat.com> - $version"; echo "- AUTOMATED BUILD BY Hydra") >> spec/lvm2.spec - mv spec/* . && rmdir spec # */ # RPM needs the spec file in the source root + cp spec/* . # */ # RPM needs the spec file in the source root # make a tarball mkdir ../LVM2.$version

9 years

1
0
0 / 0

master - vgimport: fall back when lvmetad is not running

by David Teigland

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d748b3455d2519... Commit: d748b3455d25192d68e166d89d1c6f67ac226d44 Parent: 3eb2d4d2ce3c660fb5bd99c2093a00cb8f2fa4d5 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon May 11 09:28:47 2015 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon May 11 09:28:47 2015 -0500 vgimport: fall back when lvmetad is not running If lvmetad is configured, but not running, vgimport would not fall back and run without lvmetad, but would report an error about requiring lvmetad. --- tools/vgimport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/vgimport.c b/tools/vgimport.c index b416e21..b64a7a3 100644 --- a/tools/vgimport.c +++ b/tools/vgimport.c @@ -91,7 +91,7 @@ int vgimport(struct cmd_context *cmd, int argc, char **argv) * We need to reread it to see that it's been exported before we can * import it. */ - if (lvmetad_used() && !lvmetad_pvscan_all_devs(cmd, NULL)) { + if (lvmetad_active() && !lvmetad_pvscan_all_devs(cmd, NULL)) { log_error("Failed to scan devices."); return ECMD_FAILED; }

9 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits May 2015