[DRBD-cvs] r1570 - in branches/drbd-0.7: . benchmark debian
documentation
svn at svn.drbd.org
svn at svn.drbd.org
Wed Sep 29 22:40:20 CEST 2004
Author: lars
Date: 2004-09-29 22:40:17 +0200 (Wed, 29 Sep 2004)
New Revision: 1570
Removed:
branches/drbd-0.7/documentation/HOWTO/
branches/drbd-0.7/documentation/ja/
branches/drbd-0.7/documentation/pt_BR/
Modified:
branches/drbd-0.7/ChangeLog
branches/drbd-0.7/INSTALL
branches/drbd-0.7/Makefile
branches/drbd-0.7/benchmark/README
branches/drbd-0.7/benchmark/run.sh
branches/drbd-0.7/debian/drbd.docs
branches/drbd-0.7/documentation/Makefile
branches/drbd-0.7/documentation/Makefile.lang
branches/drbd-0.7/documentation/NFS-Server-README.txt
branches/drbd-0.7/drbd.spec.in
Log:
removed outdated docu from drbd-0.7, bidirectionally verified docu changes 07 <-> 08
Modified: branches/drbd-0.7/ChangeLog
===================================================================
--- branches/drbd-0.7/ChangeLog 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/ChangeLog 2004-09-29 20:40:17 UTC (rev 1570)
@@ -4,6 +4,9 @@
Cumulative changes since last tarball.
For even more detail, use "svn log" and "svn diff".
+ * Removed HOWTO, ja, pt_BR ... all hopelessly outdated.
+ disabled benchmark/run.sh
+
0.7.4 (api:76/proto:74)
-----
* Fixed a critical bug with Linux-2.4.x and HIGHMEM!
Modified: branches/drbd-0.7/INSTALL
===================================================================
--- branches/drbd-0.7/INSTALL 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/INSTALL 2004-09-29 20:40:17 UTC (rev 1570)
@@ -4,14 +4,9 @@
It should work for SuSE, Debian, RH and other distros with slight
modifications.
- This was written for 0.6.10, and might not work for releases
- before that, since we changed our Makefile to use the top level
- kernel source Makefile, so we no longer need to worry about
- all those funny kernel compile flags...
-
- It is still correct for 0.6.13.
- Maybe this needs an update for 0.7.x,
- but most of it probably still applies.
+ This was last reviewed for drbd-0.7.5.
+ It is correct for both 0.6.10 and later,
+ and 0.7.x.
I tried to indicate what you should type by the prompt-prefix
on the below command lines. "all#", when it is the same for
@@ -26,9 +21,8 @@
http://www.drbd.org
http://www.drbd.org/drbd-article.html
- http://www.linux-mag.com/2003-11/drbd_01.html
http://www.linux-mag.com/2003-11/toc.html
- http://linuxha.trick.ca/DRBD_2fFAQ , and of course,
+ http://linuxha.trick.ca/DRBD , and of course,
http://www.drbd.org/support.html
== Prerequisites ==
@@ -69,7 +63,8 @@
The next step is just to be sure. If you know what it does,
you probably can judge on your own whether it is necessary or
- not, anyways.
+ not, anyways. If you get strange results on your first try,
+ please do this first. It sometimes really helps!
all# make mrproper
@@ -98,20 +93,24 @@
redhat# cp /boot/kernel-2.4.some-thing.config .config
or # cp configs/kernel-2.4.some-thing.config .config
# make -s oldconfig_nonint ; make -s oldconfig_nonint
+ # vi Makefile # mod EXTRAVERSION to match installed kernel
+ # (remove "custom" if neccessary)
fedora# cp /boot/config-2.4.some-thing .config
# export CC=gcc32
- # vi Makefile #mod EXTRAVERSION to match installed kernel
# yes "" | { make oldconfig ; make oldconfig ; }
+ # vi Makefile # mod EXTRAVERSION to match installed kernel
+ # (remove "custom" if neccessary)
Note:
If you consider to not run some vendor kernel, but compile
your own kernel, you need to build in module support, since
- DRBD is a module. DRBD depends on procfs, but you want to
- have that anyways. Make sure that you do not compile NBD
+ DRBD is a module (but see below for in kernel builds).
+ DRBD depends on procfs, but you want to have that anyways.
+ Make sure that you do not compile NBD
into the kernel, since DRBD uses the same major device
number. Having it as module is ok, but you cannot use both
- at the same time.
+ at the same time. (well, starting with 0.7.1, you can...)
If you do not run a selfcompiled kernel, but the binary shipped
distro kernel, and after "make install" the drbd module ends up in
@@ -119,7 +118,8 @@
in "/lib/modules/2.4.20/" ), edit the top-level Makefile of your kernel
source tree and remove "custom" from the EXTRAVERSION. Make sure you
copied in the .config corresponding to the kernel you use.
- Don't forget to "make dep" in /usr/src/linux, it sometimes helps, too.
+ For 2.4 kernels, don't forget to "make dep" in /usr/src/linux,
+ it sometimes helps, too.
(you could of course edit .kernelversion in the drbd directory,
or copy by hand, too)
@@ -136,7 +136,7 @@
all# make dep # no longer neccessary with 2.6.x
all# make linux/include/version.h
- # and since kernel 2.6.6 (some distos 2.6.5+):
+ # and since kernel 2.6.6 (some distros 2.6.5-something):
all# make modules_prepare
== Build DRBD kernel module (outside of the kernel source) ==
@@ -145,6 +145,7 @@
all# cd /usr/src
all# tar -xvzf where/you/downloaded/it/drbd-0.6.12.tar.gz
+ # or 0.7.x.tar.gz, of course
now build the module
@@ -249,8 +250,7 @@
== Building a .rpm of it ==
This should be fairly easy, there is an example spec
- file, and you can even "make rpm". If this is a CVS/SVN version,
- you might need to say "make rpm FORCE=1".
+ file, and you can even "make rpm".
If it does not work for you out of the box, first get "make install"
to work properly, see the section titled 'prepare the kernel source tree'
@@ -265,13 +265,8 @@
like in "make rpm KDIR=/usr/src/linux-include/athlon",
"make rpm KDIR=/usr/src/linux-include/smp", ...
- You then should find packages in "dist/{S,}RPMS/*/*.rpm":
+ You then should find packages in "dist/{S,}RPMS/*/*.rpm".
- ./dist/RPMS/i586/drbd-0.6.12-3.i586.rpm
- ./dist/RPMS/i586/kernel-module-drbd-0.6.12-3_2.4.21_166_default.i586.rpm
- ./dist/RPMS/i586/kernel-smp-module-drbd-0.6.12-3_2.4.21_166_4G.i586.rpm
- ...
-
Note however that your distro most likely handles rpms of kernel modules in
some special way, so you may want to first ask your ditributor to provide
some update packages themselves.
@@ -337,4 +332,4 @@
Lars Ellenberg
-Last modified: Tue Aug 24 14:07:40 UTC 2004
+Last modified: Wed Sep 29 20:33:23 UTC 2004
Modified: branches/drbd-0.7/Makefile
===================================================================
--- branches/drbd-0.7/Makefile 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/Makefile 2004-09-29 20:40:17 UTC (rev 1570)
@@ -22,7 +22,7 @@
#PREFIX = /usr/local
-SUBDIRS = user scripts benchmark documentation drbd #testing
+SUBDIRS = user scripts documentation drbd #testing #benchmark
ALLSUBDIRS = user scripts benchmark documentation drbd testing
REL_VERSION := $(shell sed -ne '/REL_VERSION/{s/^[^"]*"\([^ "]*\).*/\1/;p;q;}' drbd/linux/drbd_config.h)
@@ -84,10 +84,14 @@
then \
echo "You need to update the %changelog in drbd.spec.in"; \
up2date=false; fi; \
+ if ! grep "^$$dver_re$$" >/dev/null 2>&1 ChangeLog; \
+ then \
+ echo "You need to update ChangeLog"; \
+ up2date=false; fi ; \
if ! grep "^drbd ($$dver_re-" >/dev/null 2>&1 debian/changelog; \
then \
- echo "You need to update debian/changelog"; \
- up2date=false; fi ; \
+ echo -e "\n\n\tdebian/changelog needs some update\n"; \
+ : do not fail the build because of outdated debian/changelog ; fi ; \
$$up2date
# XXX this is newly created whenever the toplevel makefile does something.
@@ -125,8 +129,7 @@
echo drbd-$(DIST_VERSION)/drbd_config.h >> .filelist ;\
echo drbd-$(DIST_VERSION)/drbd/drbd_buildtag.c >> .filelist ;\
echo drbd-$(DIST_VERSION)/.filelist >> .filelist ;\
- for d in documentation/{ja,pt_BR}; do test -e $$d/Makefile && echo drbd-$(DIST_VERSION)/$$d/Makefile >> .filelist ; done
- @echo "./.filelist updated."
+ echo "./.filelist updated."
# tgz will no longer automatically update .filelist,
# so the tgz and therefore rpm target will work within
Modified: branches/drbd-0.7/benchmark/README
===================================================================
--- branches/drbd-0.7/benchmark/README 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/benchmark/README 2004-09-29 20:40:17 UTC (rev 1570)
@@ -1 +1,3 @@
-start "run.sh" to run the benchmark app.
\ No newline at end of file
+Needs to be reviewed
+is untouched since at least the 0.6 days
+does not work with 0.7 currently
Modified: branches/drbd-0.7/benchmark/run.sh
===================================================================
--- branches/drbd-0.7/benchmark/run.sh 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/benchmark/run.sh 2004-09-29 20:40:17 UTC (rev 1570)
@@ -5,6 +5,13 @@
echo "--------------------------------------------"
echo
+echo "
+ Needs to be reviewed
+ is untouched since at least the 0.6 days
+ does not work with 0.7 currently
+"
+exit 1
+
if [ -e config ];
then source config;
else
Modified: branches/drbd-0.7/debian/drbd.docs
===================================================================
--- branches/drbd-0.7/debian/drbd.docs 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/debian/drbd.docs 2004-09-29 20:40:17 UTC (rev 1570)
@@ -1,3 +1 @@
documentation/NFS-Server-README.txt
-documentation/HOWTO/Makefile
-documentation/HOWTO/DRBD-HOWTO.sgml
Modified: branches/drbd-0.7/documentation/Makefile
===================================================================
--- branches/drbd-0.7/documentation/Makefile 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/documentation/Makefile 2004-09-29 20:40:17 UTC (rev 1570)
@@ -24,7 +24,7 @@
# the RedHat only way is docbook2man
# hmmm, nowadays docbook2man works also on Debian
-LANGS = ja pt_BR
+LANGS =
MAKEFILES_LANG := $(foreach dir,$(LANGS),$(dir)/Makefile)
@@ -100,7 +100,7 @@
@echo "To clean the documentation: make doc-clean"
ifneq ($(DB2MAN)$(DB2HTML)$(DB2PDF)$(DB2PS),)
-doc: prepare man HOWTO/index.html
+doc: prepare man
doc-clean: distclean
@@ -117,8 +117,6 @@
distclean:
rm -f *.[58] manpage.links manpage.refs *~ manpage.log
rm -f *.ps.gz *.pdf *.ps *.html pod2htm*
- rm -f HOWTO/{*.html,*.css,suse-*.dsl,CATALOG.local}
- rm -rf HOWTO/{DRBD-HOWTO*,db2html*}/ # note the trailing slash
@ set -e; for i in $(LANGS); do ln -sf ../Makefile.lang $$i/Makefile ; $(MAKE) -C $$i clean ; rm $$i/Makefile ; done
$(MAKEFILES_LANG): Makefile.lang
@@ -132,9 +130,6 @@
man: $(MANPAGES)
@ set -e; for i in $(LANGS); do $(MAKE) -C $$i man; done
-HOWTO/index.html: HOWTO/DRBD-HOWTO.sgml
- @cd HOWTO ; $(DB2HTML) DRBD-HOWTO.sgml ; cd ..
-
install:
@ok=true; for f in $(MANPAGES) ; \
do [ -e $$f ] || { echo $$f missing ; ok=false; } ; \
Modified: branches/drbd-0.7/documentation/Makefile.lang
===================================================================
--- branches/drbd-0.7/documentation/Makefile.lang 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/documentation/Makefile.lang 2004-09-29 20:40:17 UTC (rev 1570)
@@ -83,13 +83,10 @@
man: $(MANPAGES)
-all: man HOWTO/index.html
+all: man
-HOWTO/index.html: HOWTO/DRBD-HOWTO.sgml
- cd HOWTO ; $(DB2HTML) DRBD-HOWTO.sgml ; cd ..
-
clean:
- rm -f *.[58] manpage.links manpage.refs *~ manpage.log HOWTO/*.html
+ rm -f *.[58] manpage.links manpage.refs *~ manpage.log
rm -f *.ps.gz *.pdf *.ps *.html
install:
Modified: branches/drbd-0.7/documentation/NFS-Server-README.txt
===================================================================
--- branches/drbd-0.7/documentation/NFS-Server-README.txt 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/documentation/NFS-Server-README.txt 2004-09-29 20:40:17 UTC (rev 1570)
@@ -1,3 +1,24 @@
+
+NOTE:
+ with recent drbd (>= 0.7)
+ you typically NOT place any entries in /etc/fstab,
+ and the device names are /dev/drbdX instead of /dev/nbX
+
+This file should be replaced by a proper howto.
+someone vonlunteers to write one?
+
+see also the pages at linux-ha.org,
+ there should be more, and more recent,
+ info on this and related topics:
+
+ http://linuxha.trick.ca/
+ http://www.linux-ha.org/
+
+-- lge
+
+=========================================
+
+
From: Erik de Wilde <E.deWilde at eijsink.nl>
Subject: Re: [DRBD-dev] Bad performance when disks mounted with sync but data
+corruption without sync
Modified: branches/drbd-0.7/drbd.spec.in
===================================================================
--- branches/drbd-0.7/drbd.spec.in 2004-09-29 17:00:02 UTC (rev 1569)
+++ branches/drbd-0.7/drbd.spec.in 2004-09-29 20:40:17 UTC (rev 1570)
@@ -80,11 +80,7 @@
%install
make install PREFIX=%{buildroot}/ MANDIR=%{_mandir}
-cd documentation
-mv HOWTO HOWTO.orig
-mkdir HOWTO
-find HOWTO.orig/ -name "*.html" -exec cp -p '{}' HOWTO \;
-cd ../drbd
+cd drbd
mv .kernel.config.gz k-config-%{kernelversion}.gz
FILELIST="%{_builddir}/%{name}-%{version}/file.list"
@@ -128,15 +124,8 @@
%{_mandir}/man8/drbdsetup.8.gz
%{_mandir}/man8/drbdadm.8.gz
%{_mandir}/man5/drbd.conf.5.gz
-%{_mandir}/ja/man8/drbd.8.gz
-%{_mandir}/ja/man8/drbdsetup.8.gz
-%{_mandir}/ja/man5/drbd.conf.5.gz
-%{_mandir}/pt_BR/man8/drbd.8.gz
-%{_mandir}/pt_BR/man8/drbdsetup.8.gz
-%{_mandir}/pt_BR/man5/drbd.conf.5.gz
%doc scripts/drbd.conf
%doc documentation/NFS-Server-README.txt
-%doc documentation/HOWTO
%doc COPYING
%doc README
%doc file.list
More information about the drbd-cvs
mailing list