tman: import changes from plan 9 - plan9port - [fork] Plan 9 from user space | |
git clone git://src.adamsgaard.dk/plan9port | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit cbc99e3e52703f61aee028b34f135c2e05a6a5db | |
parent e63f0507e907041e62ccc81ee518ea5426a8fd2a | |
Author: David du Colombier <[email protected]> | |
Date: Fri, 3 Jun 2011 13:23:57 -0400 | |
man: import changes from plan 9 | |
R=rsc | |
CC=plan9port.codebot | |
http://codereview.appspot.com/4559071 | |
Diffstat: | |
M man/man1/venti.1 | 3 ++- | |
M man/man3/venti-server.3 | 3 +-- | |
M man/man8/venti-backup.8 | 12 +++++++++--- | |
M man/man8/venti-fmt.8 | 65 ++++++++++++++---------------… | |
M man/man8/venti.8 | 11 +++++++---- | |
5 files changed, 49 insertions(+), 45 deletions(-) | |
--- | |
diff --git a/man/man1/venti.1 b/man/man1/venti.1 | |
t@@ -172,7 +172,8 @@ messages send/received. | |
.IR vacfs (4), | |
.IR venti (7), | |
.IR vbackup (8), | |
-.IR venti (8) | |
+.IR venti (8), | |
+.IR venti-fmt (8) | |
.SH BUGS | |
There should be programs to read and write | |
venti files and directories. | |
diff --git a/man/man3/venti-server.3 b/man/man3/venti-server.3 | |
t@@ -119,4 +119,4 @@ blocks written to it and returns error on all reads. | |
.IR venti-conn (3), | |
.IR venti-packet (3), | |
.IR venti (7), | |
-.IR venti (8) | |
-\ No newline at end of file | |
+.IR venti (8) | |
diff --git a/man/man8/venti-backup.8 b/man/man8/venti-backup.8 | |
t@@ -5,7 +5,7 @@ rdarena, wrarena \- copy arenas between venti servers | |
.PP | |
.B venti/rdarena | |
[ | |
-.B -v | |
+.B -qv | |
] | |
.I arenapart | |
.I arenaname | |
t@@ -34,7 +34,9 @@ and writes this arena to standard output. | |
This command is typically used to back up an arena to external media. | |
The | |
.B -v | |
-option generates more verbose output on standard error. | |
+option generates more verbose output on standard error; | |
+.B -q | |
+generates only errors on standard error. | |
.PP | |
.I Wrarena | |
writes the blocks contained in the arena | |
t@@ -97,10 +99,14 @@ awk '/^end offset/ { print $3 }' offset >last | |
Of course, one would need to add wrapper code to keep track | |
of which arenas have been processed. | |
See | |
-.B /sys/src/cmd/venti/backup.example | |
+.B /sys/src/cmd/venti/words/backup.example | |
for a version that does this. | |
.SH SOURCE | |
.B \*9/src/cmd/venti/srv | |
.SH SEE ALSO | |
.IR venti (7), | |
.IR venti (8) | |
+.SH BUGS | |
+.I Wrarena | |
+can't read a pipe or network connection containing an arena; | |
+it needs a file already containing the entire arena. | |
diff --git a/man/man8/venti-fmt.8 b/man/man8/venti-fmt.8 | |
t@@ -69,14 +69,15 @@ syncindex \- prepare and maintain a venti server | |
.PP | |
.B venti/buildindex | |
[ | |
-.B -B | |
-.I blockcachesize | |
-] | |
-[ | |
-.B -Z | |
+.B -bd | |
+] [ | |
+.B -i | |
+.I isect | |
+] ... [ | |
+.B -M | |
+.I imemsize | |
] | |
.I venti.conf | |
-.I tmp | |
.PP | |
.B venti/checkindex | |
[ | |
t@@ -94,17 +95,6 @@ syncindex \- prepare and maintain a venti server | |
.B -afv | |
] | |
.I file | |
-.PP | |
-.B venti/copy | |
-[ | |
-.B -f | |
-] | |
-.I src | |
-.I dst | |
-.I score | |
-[ | |
-.I type | |
-] | |
.SH DESCRIPTION | |
These commands aid in the setup, maintenance, and debugging of | |
venti servers. | |
t@@ -325,13 +315,12 @@ This command is typically used to build a new index for … | |
system when the old index becomes too small, or to rebuild | |
an index after media failure. | |
Small errors in an index can usually be fixed with | |
-.IR checkindex . | |
-.PP | |
-The | |
-.I tmp | |
-file, usually a disk partition, must be large enough to store a copy of the in… | |
-This temporary space is used to perform a merge sort of index entries | |
-generated by reading the arenas. | |
+.IR checkindex , | |
+but | |
+.I checkindex | |
+requires a large temporary workspace and | |
+.I buildindex | |
+does not. | |
.PP | |
Options to | |
.I buildindex | |
t@@ -339,18 +328,26 @@ are: | |
.TF "\fL-M\fI imemsize" | |
.PD | |
.TP | |
-.BI -B " blockcachesize | |
+.B -b | |
+Reinitialise the Bloom filter, if any. | |
+.TP | |
+.B -d | |
+`Dumb' mode; run all three passes. | |
+.TP | |
+.BI -i " isect | |
+Only rebuild index section | |
+.IR isect ; | |
+may be repeated to rebuild multiple sections. | |
+The name | |
+.L none | |
+is special and just reads the arenas. | |
+.TP | |
+.BI -M " imemsize | |
The amount of memory, in bytes, to use for caching raw disk accesses while run… | |
.IR buildindex . | |
(This is not a property of the created index.) | |
-The default is 8k. | |
-.TP | |
-.B -Z | |
-Do not zero the index. | |
-This option should only be used when it is known that the index was already ze… | |
-(Version 1 indexes only; see the discussion in | |
-.I fmtindex | |
-above.) | |
+The usual suffices apply. | |
+The default is 256M. | |
.PD | |
.PP | |
.I Checkindex | |
t@@ -409,5 +406,3 @@ Increase the verbosity of output. | |
.SH BUGS | |
.I Buildindex | |
should allow an individual index section to be rebuilt. | |
-The merge sort could be performed in the space used to store the | |
-index rather than requiring a temporary file. | |
diff --git a/man/man8/venti.8 b/man/man8/venti.8 | |
t@@ -1,10 +1,12 @@ | |
.TH VENTI 8 | |
.SH NAME | |
-venti \- archival storage server | |
+venti \- archival storage server | |
.SH SYNOPSIS | |
+.in +0.25i | |
+.ti -0.25i | |
.B venti/venti | |
[ | |
-.B -Ldsw | |
+.B -Ldrs | |
] | |
[ | |
.B -a | |
t@@ -18,8 +20,6 @@ venti \- archival storage server | |
.B -c | |
.I config | |
] | |
-.PP | |
-.B " " | |
[ | |
.B -C | |
.I lumpcachesize | |
t@@ -438,6 +438,9 @@ Implies | |
Enable logging. By default all logging is disabled. | |
Logging slows server operation considerably. | |
.TP | |
+.B -r | |
+Allow only read access to the venti data. | |
+.TP | |
.B -s | |
Do not run in the background. | |
Normally, |