shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

lvmetad: Warn if lvmetad is running but disabled.

Browse Source
This commit is contained in:
Petr Rockai 2012-10-10 12:33:48 +02:00
parent 622fb968a2
commit 71d718a4a4
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cache/lvmetad.c vendored
View File

@ -41,6 +41,8 @@ void lvmetad_disconnect(void)
void lvmetad_init(struct cmd_context *cmd) void lvmetad_init(struct cmd_context *cmd)
{ {
if (!_lvmetad_use && !access(LVMETAD_PIDFILE, F_OK))
log_warn("WARNING: lvmetad is running but disabled. Restart lvmetad before enabling it!");
if (_lvmetad_use && _lvmetad_socket && !_lvmetad_connected) { if (_lvmetad_use && _lvmetad_socket && !_lvmetad_connected) {
assert(_lvmetad_socket); assert(_lvmetad_socket);
_lvmetad = lvmetad_open(_lvmetad_socket); _lvmetad = lvmetad_open(_lvmetad_socket);

1
test/Makefile.in
View File

@ -99,6 +99,7 @@ lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp
echo 'abs_builddir=$(abs_builddir)' >> $@-t echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
echo 'export THIN=@THIN@' >> $@-t echo 'export THIN=@THIN@' >> $@-t
echo 'export LVMETAD_PIDFILE=@LVMETAD_PIDFILE@' >> $@-t
mv $@-t $@ mv $@-t $@
LIB = lib/not lib/should lib/harness \ LIB = lib/not lib/should lib/harness \

26
test/shell/lvmetad-disabled.sh Normal file
View File

@ -0,0 +1,26 @@
#!/bin/sh
# Copyright (C) 2012 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, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
. lib/test
test -e LOCAL_LVMETAD || skip
kill $(cat LOCAL_LVMETAD)
test -e $LVMETAD_PIDFILE && skip
lvmetad
test -e $LVMETAD_PIDFILE
cp $LVMETAD_PIDFILE LOCAL_LVMETAD
pvs 2>&1 | not grep "lvmetad is running"
aux lvmconf "global/use_lvmetad = 0"
pvs 2>&1 | grep "lvmetad is running"
kill $(cat $LVMETAD_PIDFILE)
not ls $LVMETAD_PIDFILE