robk-tahoe [Thu, 16 Oct 2008 15:08:46 +0000 (08:08 -0700)]
fuse/blackmatch: split into client/server (twisted server)
This implements a client/server split for blackmatch, where the client
implements the fuse_main bindings and a simple blocking rpc client mechanism.
The server implements the other half of that rpc mechanism, and contains all
the actual logic for interpreting fuse requests in the context of the on disk
cache and requests to the tahoe node. The server is based on a twisted reactor.
The rpc mechanism implements a simple method dispatch including marshalling,
using json, of basic inert data types, in a flat namespace (no objects).
The client side is written in a blocking idiom, to interface with the threading
model used by the fuse_main bindings, whereas the server side is written for a
twisted reactor-based environment, intended to facilitate implementing more
sophisticated logic in that paradigm. The two communicate over a unix domain
socket, allocated within the nodedir.
Command line usage is unchanged; the server is launched automatically by the
client. The server daemonizes itself, to avoid preventing the original parent
process (e.g. 'runtests') from waiting upon the server exiting.
The client keeps open a 'keepalive' connection to the server; upon loss thereof
the server will exit. This addresses the fact that the python-fuse bindings
provide no notification of exit of the client process upon unmount.
The client thus provides a relatively thin 'shim' proxying requests from the
fuse_main bindings across the rpc to the server process, which handles the
logic behind each request.
For the time being, a '--no-split' option is provided to surpress the splitting
into client/server, yielding the prior behaviour. Once the server logic gets
more complex and more entrenched in a twisted idiom, this might be removed.
The 'runtests' test harness currently tests both modes, as 'impl_c' and
'impl_c_no_split'
robk-tahoe [Thu, 16 Oct 2008 14:35:47 +0000 (07:35 -0700)]
fuse/blackmatch: 'flatten' the fuse api implementation
the previous revision of blackmatch used a file_class to delegate all fuse
api operations on files to a specific per-file class, which is an option
given by the python-fuse bindings.
this is a pre-cursor to the 'split' client/server version, which uses a
simple, moreover flat, rpc mechanism to broker access to methods.
robk-tahoe [Thu, 16 Oct 2008 14:32:32 +0000 (07:32 -0700)]
fuse/runtests: disable impl_a/impl_b on mac, as they don't actually work.
robk-tahoe [Thu, 16 Oct 2008 14:29:26 +0000 (07:29 -0700)]
fuse/runtests: added write_partial_overwrite test
this tests opening a file for update, overwriting a small part of it, and
ensuring that the end result constitutes an overwrite of the original file.
This tests, e.g. the implementation doesn' open a 'fresh' file but does in
fact initialise the file to be uploaded with the contents of any extant
file before applying updates
robk-tahoe [Thu, 16 Oct 2008 14:28:36 +0000 (07:28 -0700)]
fuse/runtests: added --tests, renamed --suites
changed the --tests option to be --suites, as it takes a prefix, e.g. 'read'
'write' (or 'all', the default) and runs those suites which are applicable to
each implementation being tested.
added a --tests option, which takes a list of tests, e.g. 'read_file_contents'
'write_overlapping_large_writes' and runs all tests specified without regard
to whether the implementation(s) under test are declared to support them.
this is basically to allow a specific test or two to be run, saving time
during development and debugging by not running the entire suite
robk-tahoe [Fri, 3 Oct 2008 23:34:36 +0000 (16:34 -0700)]
fuse/runtests: added 'random scatter' write test
this writes the test file in a randomised order, with randomly sized writes.
also for each 'slice' of the file written, a randomly chosen overlapping
write is also made to the file. this ensures that the file will be written
in its entirety in a thoroughly random order, with many overlapping writes.
robk-tahoe [Fri, 3 Oct 2008 22:48:33 +0000 (15:48 -0700)]
fuse/runtests: add overlapping write tests
using both small and large blocksizes for writes, write a 1Mb file to fuse
where every write overlaps another.
This serves a useful purpose - in manual testing of blackmatch some time ago
most operations e.g. bulk copies, worked fine, but using rsync caused data
corruption on most files. it turned out to be that rsync writes in 64K blocks,
but rather than making the last block short, the last block instead overlaps
the preceding (already written) block. This revealed a problem where cache
files were being opened 'append' rather than 'write' and hence the overlapping
write to the fuse layer caused the overlapping portion of the file to be
duplicated in cache, leading to oversized and corrupt files being uploaded.
robk-tahoe [Fri, 3 Oct 2008 22:39:44 +0000 (15:39 -0700)]
fuse/runtests: remove write small file test, as it's subsumed by the tiny_file test
robk-tahoe [Fri, 3 Oct 2008 22:35:50 +0000 (15:35 -0700)]
fuse/runtests: added linear write tests for various block sizes
unit tests to test writing contiguous blocks linearly through the file,
for a variety of block sizes; 'tiny_file' is an entire file fitting within
a single io block / write operation. 'linear_{small,large}_writes' test
a 1Mb file written with each write operation containing significantly less
or more, respecitvely, data than fuse will pass into the implementation as
a single operation (which on the mac at least is 64Kib)
robk-tahoe [Fri, 3 Oct 2008 17:20:44 +0000 (10:20 -0700)]
fuse/runtests: add a very simple 'write' test
this performs a very simple write through the fuse layer and confirms that
the file is stored correctly into the tahoe mesh. ('simple' in the sense
that the entire file body fits trivially in a single write() operation,
disk block etc)
robk-tahoe [Fri, 3 Oct 2008 17:20:26 +0000 (10:20 -0700)]
fuse/runtests: added a --web-open option
similar to the --debug-wait option which causes the test harness to
pause at various stages of the process to facilitate debugging, this
option simplifies that debugging by automatically opening a web browser
to the root dir of that implementation's tests when tests are commenced.
in addition, if --web-open is specfied but --debug-wait is not, the
harness will still pause after running tests but before tearing down
the tahoe grid - this allows all tests to run to completion, but
provide a debugging hook to investigate the end state of the grid's
contents thereafter.
robk-tahoe [Fri, 3 Oct 2008 17:13:09 +0000 (10:13 -0700)]
fuse/impl_a: fix a suspected bug in caching
from my examination of the tahoe_fuse ('impl_a') code, it looks like
the intention is to cache the file contents in memory while it's open,
since it does in fact do that. however it looks like it also ignored
that cache entirely, and made an individual tahoe webapi GET request
for each and every read() operation regardless of the relative size of
the read block and the file in question.
this changes that to make read() use the data in memory rather than
fetch the data over again. if there's something more subtle going
on, please let me know.
robk-tahoe [Thu, 25 Sep 2008 23:32:35 +0000 (16:32 -0700)]
gui/macapp: slew of code cleanup; unmount filesystems on quit
a handful of code cleanup, renaming and refactoring. basically consolidating
'application logic' (mount/unmount fs) into the 'MacGuiApp' class (the wx.App)
and cleaning up various scoping things around that. renamed all references to
'app' to refer more clearly to the 'AppContainer' or to the guiapp.
globally renamed basedir -> nodedir
also made the guiapp keep a note of each filesystem it mounts, and unmount
them upon 'quit' so as to cleanup the user's environment before the tahoe node
vanishes from out underneath the orphaned tahoe fuse processes
robk-tahoe [Thu, 25 Sep 2008 16:39:19 +0000 (09:39 -0700)]
gui/macapp: make submenu of aliases for 'webopen'
this changes the 'open webroot' menu item to be a submenu listing all aliases
defined in ~/.tahoe. Note that the dock menu does not support submenus, so it
only offers a single 'open webroot' option for the default tahoe: alias.
I had trouble with this at first and concluded that the submenus didn't work,
and made it a distinct 'WebUI' menu in it's own right. on further inspection,
there are still problems but they seem to be something like once the dock menu
has been used, sometimes the app's main menubar menus will cease to function,
and this happens regardless of whether submenus or plain simple menus are used.
I have no idea what the peoblem is, but it's not submenu specific.
Zooko O'Whielacronx [Thu, 16 Oct 2008 19:48:48 +0000 (12:48 -0700)]
repairer: fix flaw in testutil.flip_one_bit() that Brian pointed out
Brian Warner [Wed, 15 Oct 2008 22:09:40 +0000 (15:09 -0700)]
misc/incident-gatherer: add classify_tahoe.py: a foolscap incident-gatherer classification plugin
Zooko O'Whielacronx [Tue, 14 Oct 2008 23:09:20 +0000 (16:09 -0700)]
repairer: test all different kinds of corruption that can happen to share files on disk
Brian Warner [Mon, 13 Oct 2008 22:52:58 +0000 (15:52 -0700)]
util/time_format.py: accept space separator, add unit tests
Brian Warner [Fri, 10 Oct 2008 02:11:39 +0000 (19:11 -0700)]
test_storage: use different filenames, poor stupid windows
Brian Warner [Fri, 10 Oct 2008 01:34:22 +0000 (18:34 -0700)]
scripts/debug.py: emit the immutable-share version number, tolerate v2
Brian Warner [Fri, 10 Oct 2008 01:14:25 +0000 (18:14 -0700)]
storage.py: improve some precondition() error messages
Brian Warner [Fri, 10 Oct 2008 01:13:27 +0000 (18:13 -0700)]
storage: introduce v2 immutable shares, with 8-byte offsets fields, to remove two of the three size limitations in #346. This code handles v2 shares but does not generate them. We'll make a release with this v2-tolerance, wait a while, then make a second release that actually generates v2 shares, to avoid compatibility problems.
Brian Warner [Fri, 10 Oct 2008 00:29:22 +0000 (17:29 -0700)]
debug.py: oops, add missing import for ReadBucketProxy
Brian Warner [Fri, 10 Oct 2008 00:08:00 +0000 (17:08 -0700)]
storage: split WriteBucketProxy and ReadBucketProxy out into immutable/layout.py . No behavioral changes.
Zooko O'Whielacronx [Thu, 9 Oct 2008 19:13:57 +0000 (12:13 -0700)]
interfaces: loosen a few max-size constraints which would limit us to a mere 1.09 TB maximum file size
These constraints were originally intended to protect against attacks on the
storage server protocol layer which exhaust memory in the peer. However,
defending against that sort of DoS is hard -- probably it isn't completely
achieved -- and it costs development time to think about it, and it sometimes
imposes limits on legitimate users which we don't necessarily want to impose.
So, for now we forget about limiting the amount of RAM that a foolscap peer can
cause you to start using.
Brian Warner [Tue, 7 Oct 2008 20:19:45 +0000 (13:19 -0700)]
util/limiter: add a repr
Brian Warner [Tue, 7 Oct 2008 20:19:29 +0000 (13:19 -0700)]
dirnode.build_manifest: include node.list in the limiter, that's the most important thing to slow down
Brian Warner [Tue, 7 Oct 2008 20:18:45 +0000 (13:18 -0700)]
web/directory: t=manifest output=html: make the caps into clickable hrefs
Brian Warner [Tue, 7 Oct 2008 20:17:42 +0000 (13:17 -0700)]
web/directory: factor out the get_root function
Brian Warner [Tue, 7 Oct 2008 19:48:20 +0000 (12:48 -0700)]
web/directory.py: remove unused imports
Brian Warner [Tue, 7 Oct 2008 05:11:47 +0000 (22:11 -0700)]
test_web: deep-size is more variable than I thought, so assert less
Brian Warner [Tue, 7 Oct 2008 04:36:18 +0000 (21:36 -0700)]
web: change t=manifest to return a list of (path,read/writecap) tuples, instead of a list of verifycaps. Add output=html,text,json.
Brian Warner [Tue, 7 Oct 2008 04:35:39 +0000 (21:35 -0700)]
web: rewrite t=deep-size in terms of deep-stats, update test to match inclusion of directory sizes
Brian Warner [Tue, 7 Oct 2008 01:45:13 +0000 (18:45 -0700)]
ftpd: hush pyflakes
Brian Warner [Tue, 7 Oct 2008 01:14:11 +0000 (18:14 -0700)]
ftpd: make sure we're using a patched/fixed Twisted, to avoid confusion later
Brian Warner [Tue, 7 Oct 2008 01:06:05 +0000 (18:06 -0700)]
ftp: change the twisted hack necessary for async-write-close, to one more agreeable to the twisted-dev folks, add a copy of the necessary patch to docs/ftp.txt
Brian Warner [Mon, 6 Oct 2008 23:16:20 +0000 (16:16 -0700)]
ftpd: remove debug messages
Brian Warner [Mon, 6 Oct 2008 23:15:11 +0000 (16:15 -0700)]
ftpd: add native_client.php -based HTTP authentication scheme
Brian Warner [Mon, 6 Oct 2008 22:51:24 +0000 (15:51 -0700)]
ftpd: add ftp.accounts checker, remove InMemoryPasswordChecker
Brian Warner [Mon, 6 Oct 2008 22:50:37 +0000 (15:50 -0700)]
test_system: add test coverage for immutable download.ConsumerAdapter, remove debug messages
Brian Warner [Mon, 6 Oct 2008 19:52:36 +0000 (12:52 -0700)]
ftp server: initial implementation. Still needs unit tests, custom Twisted patches. For #512
Brian Warner [Tue, 7 Oct 2008 00:42:04 +0000 (17:42 -0700)]
test_cli.py: remove unused imports
Brian Warner [Tue, 7 Oct 2008 00:23:20 +0000 (17:23 -0700)]
CLI: remove 'tahoe admin generate-keypair', since the pycryptopp ecdsa API is about to change incompatibly. We'll undo this once pycryptopp is updated
Zooko O'Whielacronx [Mon, 6 Oct 2008 21:05:00 +0000 (14:05 -0700)]
docs: update architecture.txt 's section on the vdrive a.k.a. filesystem layer
Remove some obsolete parts (correct at the time, now incorrect), change terminology to reflect my preference: s/vdrive/filesystem/ and s/dirnode/directory/, and make a few other small changes.
Brian Warner [Fri, 3 Oct 2008 01:08:45 +0000 (18:08 -0700)]
dirnode: fix my remarkably-consistent 'metdadata' typo
Brian Warner [Fri, 3 Oct 2008 00:52:49 +0000 (17:52 -0700)]
interfaces: fix minor typo
Brian Warner [Fri, 3 Oct 2008 00:52:03 +0000 (17:52 -0700)]
dirnode: add get_child_and_metadata_at_path
Brian Warner [Fri, 3 Oct 2008 00:27:49 +0000 (17:27 -0700)]
stop using 'as' as an identifier: as with 'with', 'as' has become a reserved word in python 2.6
Brian Warner [Wed, 1 Oct 2008 23:52:38 +0000 (16:52 -0700)]
scripts/admin: split up generate_keypair code so that unit tests can use it more easily
Zooko O'Whielacronx [Wed, 1 Oct 2008 21:07:03 +0000 (14:07 -0700)]
docs: add some notes about things to do for a Tahoe release on pypi, freshmeat, and launchpad
Brian Warner [Wed, 1 Oct 2008 00:30:53 +0000 (17:30 -0700)]
misc/cpu-watcher.tac: use writeaside-and-rename for the history.pickle file
Brian Warner [Tue, 30 Sep 2008 23:34:48 +0000 (16:34 -0700)]
misc/spacetime: use async polling so we can add a 60-second timeout, add an index to the 'url' Axiom column for 2x speedup
Brian Warner [Tue, 30 Sep 2008 23:21:49 +0000 (16:21 -0700)]
#518: replace various BASEDIR/* config files with a single BASEDIR/tahoe.cfg, with backwards-compatibility of course
Brian Warner [Tue, 30 Sep 2008 22:21:06 +0000 (15:21 -0700)]
tolerate simplejson-2.0.0 and newer, which frequently return bytestrings instead of unicode objects. Closes #523
Brian Warner [Tue, 30 Sep 2008 20:20:51 +0000 (13:20 -0700)]
munin/tahoe_doomsday: oops, tolerate 'null' in the timeleft results, to unbreak the 2wk/4wk graphs
Brian Warner [Tue, 30 Sep 2008 06:08:16 +0000 (23:08 -0700)]
test_node: improve coverage of advertised_ip_addresses a bit
Brian Warner [Tue, 30 Sep 2008 05:23:09 +0000 (22:23 -0700)]
testutil.PollMixin: set default timeout (to 100s), emit a more helpful error when the timeout is hit
Zooko O'Whielacronx [Fri, 26 Sep 2008 22:49:13 +0000 (15:49 -0700)]
repair: fix test to map from storage index to directory structure properly (thanks, cygwin buildbot, for being so kloodgey that you won't accept random binary filenames and thus making me notice this bug)
Zooko O'Whielacronx [Fri, 26 Sep 2008 22:23:53 +0000 (15:23 -0700)]
repairer: assert that the test code isn't accidentally allowing the repairer code which is being tested to do impossible things
Zooko O'Whielacronx [Fri, 26 Sep 2008 17:47:19 +0000 (10:47 -0700)]
repairer: enhance the repairer tests
Make sure the file can actually be downloaded afterward, that it used one of the
deleted and then repaired shares to do so, and that it repairs from multiple
deletions at once (without using more than a reasonable amount of calls to
storage server allocate).
Brian Warner [Fri, 26 Sep 2008 16:57:54 +0000 (09:57 -0700)]
netstring: add required_trailer= argument
Brian Warner [Fri, 26 Sep 2008 16:55:26 +0000 (09:55 -0700)]
test_netstring.py: move netstring tests to a separate file
Brian Warner [Fri, 26 Sep 2008 04:38:24 +0000 (21:38 -0700)]
move netstring() and split_netstring() into a separate util.netstring module
Zooko O'Whielacronx [Thu, 25 Sep 2008 22:09:54 +0000 (15:09 -0700)]
repairer: remove a test that doesn't apply to the repair-from-corruption case
Zooko O'Whielacronx [Thu, 25 Sep 2008 22:07:12 +0000 (15:07 -0700)]
repairer: add a test that repairer fixes corrupted shares (in addition to the test that it fixes deleted shares)
Zooko O'Whielacronx [Thu, 25 Sep 2008 21:34:57 +0000 (14:34 -0700)]
docs: proposed mutable file crypto design with ECDSA, 96-bit private keys, and semi-private keys (from http://allmydata.org/~zooko/lafs.pdf )
Zooko O'Whielacronx [Thu, 25 Sep 2008 21:34:33 +0000 (14:34 -0700)]
docs: mutable file crypto design (from http://allmydata.org/~zooko/lafs.pdf )
Zooko O'Whielacronx [Thu, 25 Sep 2008 18:24:36 +0000 (11:24 -0700)]
repairer: fix swapped docstrings; thanks Brian
Zooko O'Whielacronx [Thu, 25 Sep 2008 18:04:22 +0000 (11:04 -0700)]
trivial: remove unused imports; thanks, pyflakes
Zooko O'Whielacronx [Thu, 25 Sep 2008 17:34:53 +0000 (10:34 -0700)]
trivial: remove unused imports -- thanks, pyflakes
Zooko O'Whielacronx [Thu, 25 Sep 2008 17:16:53 +0000 (10:16 -0700)]
repairer: add basic test of repairer, move tests of immutable checker/repairer from test_system to test_immutable_checker, remove obsolete test helper code from test_filenode
Hm... "Checker" ought to be renamed to "CheckerRepairer" or "Repairer" at some point...
Zooko O'Whielacronx [Thu, 25 Sep 2008 16:15:44 +0000 (09:15 -0700)]
setup: remove a few minimal unit tests from test_filenode which have been obviated by much better tests in test_mutable and test_system
robk-tahoe [Thu, 25 Sep 2008 14:12:24 +0000 (07:12 -0700)]
gui/macapp: rough cut of ui tweaks; configurability, auto-mount
chatting with peter, two things the mac gui needed were the ability to mount
the 'allmydata drive' automatically upon launching the app, and open the
Finder to reveal it. (also a request to hide the debug 'open webroot' stuff)
this (somewhat rough) patch implements all the above as default behaviour
it also contains a quick configuration mechanism for the gui - rather than a
preferences gui, running with a more 'tahoe' styled mechanism, the contents
of a few optional files can modify the default behaviour, specifically file
in ~/.tahoe/gui.conf control behaviour as follows:
auto-mount (bool): if set (the default) then the mac app will, upon launch
automatically mount the 'tahoe:' alias with the display name 'Allmydata'
using a mountpoint of ~/.tahoe/mnt/__auto__
auto-open (bool): if set (the default) then upon mounting a file system
(including the auto-mount if set) finder will be opened to the mountpoint
of the filesystem, which essentially reveals the newly mounted drive in a
Finder window
show-webopen (bool): if set (false by default) then the 'open webroot'
action will be made available in both the dock and file menus of the app
daemon-timout (int): sets the daemon-timeout option passed into tahoe fuse
when a filesystem is mounted. this defaults to 5 min
files of type (int) much, naturally contain a parsable int representation.
files of type (bool) are considered true if their (case-insensitive) contents
are any of ['y', 'yes', 'true', 'on', '1'] and considered false otherwise.
robk-tahoe [Thu, 25 Sep 2008 13:54:15 +0000 (06:54 -0700)]
gui/macapp: improve 'about' box
adds exactly 1 metric dollop of professionalism to the previously
rather amateurish looking about box.
robk-tahoe [Thu, 25 Sep 2008 13:47:30 +0000 (06:47 -0700)]
fuse/impl_c: UNDO --auto-fsid option
rolling back:
Thu Sep 25 14:42:23 BST 2008 robk-tahoe@allmydata.com
* fuse/impl_c: add --auto-fsid option
this was inspired by reading the fuse docs and discovering the 'fsid' option
to fuse_main, and was _intended_ to support a sort of 'stability' to the
filesystem (specifically derived from the root-uri mounted, whether directly
or via an alias) to support mac aliases across unmount/remount etc.
some experimentation shows that that doesn't actually work, and that, at
least for mac aliases in my testing, they're tied to path-to-mountpoint and
not to the fsid - which seems to have no bearing. perhaps the 'local' flag
is causing weirdness therein.
at any rate, I'm recording it simply for posterity, in case it turns out to
be useful after all somewhere down the road.
M ./contrib/fuse/impl_c/blackmatch.py +13
robk-tahoe [Thu, 25 Sep 2008 13:42:23 +0000 (06:42 -0700)]
fuse/impl_c: add --auto-fsid option
this was inspired by reading the fuse docs and discovering the 'fsid' option
to fuse_main, and was _intended_ to support a sort of 'stability' to the
filesystem (specifically derived from the root-uri mounted, whether directly
or via an alias) to support mac aliases across unmount/remount etc.
some experimentation shows that that doesn't actually work, and that, at
least for mac aliases in my testing, they're tied to path-to-mountpoint and
not to the fsid - which seems to have no bearing. perhaps the 'local' flag
is causing weirdness therein.
at any rate, I'm recording it simply for posterity, in case it turns out to
be useful after all somewhere down the road.
robk-tahoe [Thu, 25 Sep 2008 03:11:49 +0000 (20:11 -0700)]
manhole: be more tolerant of authorized_keys. files in .tahoe
both peter and I independently tried to do the same thing to eliminate the
authorized_keys file which was causing problems with the broken mac build
(c.f. #522) namely mv authorized_keys.8223{,.bak} but the node is, ahem,
let's say 'intolerant' of the trailing .bak - rather than disable the
manhole as one might expect, it instead causes the node to explode on
startup. this patch makes it skip over anything that doesn't pass the
'parse this trailing stuff as an int' test.
robk-tahoe [Thu, 25 Sep 2008 01:42:14 +0000 (18:42 -0700)]
fuse/impl_c: move mac tahoefuse impl out into contrib/fuse
For a variety of reasons, high amongst them the fact that many people
interested in fuse support for tahoe seem to have missed its existence,
the existing fuse implementation for tahoe, previously 'mac/tahoefuse.py'
has been renamed and moved.
It was suggested that, even though the mac build depends upon it, that
the mac/tahoefuse implementation be moved into contrib/fuse along with
the other fuse implementations. The fact that it's not as extensively
covered by unit tests as mainline tahoe was given as corroboration.
In a bid to try and stem the confusion inherent in having tahoe_fuse,
tfuse and tahoefuse jumbled together (not necessarily helped by
referring to them as impl_a, b and c respectively) I'm hereby renaming
tahoefuse as 'blackmatch' (black match is, per wikipedia "a type of
crude fuse" hey, I'm a punny guy) Maybe one day it'll be promoted to
be 'quickmatch' instead...
Anyway, this patch moves mac/tahoefuse.py out to contrib/fuse/impl_c/
as blackmatch.py, and makes appropriate changes to the mac build process
to transclude blackmatch therein. this leaves the extant fuse.py and
fuseparts business in mac/ as-is and doesn't attempt to address such
issues in contrib/fuse/impl_c.
it is left as an exercise to the reader (or the reader of a message
to follow) as to how to deal with the 'fuse' python module on the mac.
as of this time, blackmatch should work on both mac and linux, and
passes the four extant tests in runtests. (fwiw neither impl_a nor
impl_b have I managed to get working on the mac yet)
since blackmatch supports a read-write and caching fuse interface to
tahoe, some write tests obviously need to be added to runtests.
robk-tahoe [Thu, 25 Sep 2008 01:01:28 +0000 (18:01 -0700)]
macapp: changes to support aliases, updated tahoefuse command line options
the tahoefuse command line options changed to support the runtests harness,
and as part of that gained support for named aliases via --alias
this changes the mac app's invocation of tahoefuse to match that, and also
changes the gui to present the list of defined aliases as valid mounts
this replaces the previous logic which examined the ~/.tahoe/private directory
looking for files ending in '.cap' - an ad-hoc alias mechanism.
if a file is found matching ~/.tahoe/private/ALIASNAME.icns then that will still
be passed to tahoefuse as the icon to display for that filesystem. if no such
file is found, the allmydata icon will be used by default.
the '-olocal' option is passed to tahoefuse. this is potentially contentious.
specifically this is telling the OS that this is a 'local' filesystem, which is
intended to be used to locally attached devices. however leopard (OSX 10.5)
will only display non-local filesystems in the Finder's side bar if they are of
fs types specifically known by Finder to be network file systems (nfs, cifs,
webdav, afp) hence the -olocal flag is the only way on leopard to cause finder
to display the mounted filesystem in the sidebar, but it displays as a 'device'.
there is a potential (i.e. the fuse docs carry warnings) that this may cause
vague and unspecified undesirable behaviour.
(c.f. http://code.google.com/p/macfuse/wiki/FAQ specifically Q4.3 and Q4.1)
robk-tahoe [Thu, 25 Sep 2008 00:15:35 +0000 (17:15 -0700)]
fuse/impl_c: reworking of mac/tahoefuse, command line options, test integration
a handful of changes to the tahoefuse implementation used by the mac build, to
make command line option parsing more flexible and robust, and moreover to
facilitate integration of this implementation with the 'runtests' test harness
used to test the other two implementations.
this patch includes;
- improvements to command line option parsing [ see below ]
- support for 'aliases' akin to other tahoe tools
- tweaks to support linux (ubuntu hardy)
the linux support tweaks are, or at least seem to be, a result of the fact that
hardy ships with fuse 0.2pre3, as opposed to the fuse0.2 that macfuse is based
upon. at least the versions I was working with have discrepencies in their
interfaces, but on reflection this is probably a 'python-fuse' version issue
rather than fuse per se. At any rate, the fixes to handling the Stat objects
should be safe against either version, it's just that the bindings on hardy
lacked code that was in the 'fuse' python module on the mac...
command line options:
the need for more flexible invocation in support of the runtests harness led
me to rework the argument parsing from some simple positional hacks with a
pass-through of the remainder to the fuse binding's 'fuse_main' to a system
using twisted.usage to parse arguments, and having just one option '-o' being
explicitly a pass-through for -o options to fuse_main. the options are now:
--node-directory NODEDIR : this is used to look up the node-url to connect
to if that's not specified concretely on the command line, and also used to
determine the location of the cache directory used by the implementation,
specifically '_cache' within the nodedir. default value: ~/.tahoe
--node-url NODEURL : specify a node-url taking precendence over that found
in the node.url file within the nodedir
--alias ALIAS : specifies the named alias should be mounted. a lookup is
performed in the alias table within 'nodedir' to find the root dir cap
the named alias must exist in the alias table of the specified nodedir
--root-uri ROOTURI : specifies that the given directory uri should be mounted
at least one of --alias and --root-uri must be given (which directory to mount
must be specified somehow) if both are given --alias takes precedence.
--cache-timeout TIMEOUTSECS : specifies the number of seconds that cached
directory data should be considered valid for. this tahoefuse implementation
implements directory caching for a limited time; largely because the mac (i.e.
the Finder in particular) tends to make a large number of requests in quick
successsion when browsing the filesystem. on the flip side, the 'runtests'
unit tests fail in the face of such caching because the changes made to the
underlying tahoe directories are not reflected in the fuse presentation. by
specifying a cache-timeout of 0 seconds, runtests can force the fuse layer
into refetching directory data upon each request.
any number of -oname=value options may be specified on the command line,
and they will all be passed into the underlying fuse_main call.
a single non-optional argument, the mountpoint, must also be given.
robk-tahoe [Wed, 24 Sep 2008 18:36:01 +0000 (11:36 -0700)]
fuse/tests: slew of changes to fuse 'runtests'
This patch makes a significant number of changes to the fuse 'runtests' script
which stem from my efforts to integrate the third fuse implementation into this
framework. Perhaps not all were necessary to that end, and I beg nejucomo's
forebearance if I got too carried away.
- cleaned up the blank lines; imho blank lines should be empty
- made the unmount command switch based on platform, since macfuse just uses
'umount' not the 'fusermount' command (which doesn't exist)
- made the expected working dir for runtests the contrib/fuse dir, not the
top-level tahoe source tree - see also discussion of --path-to-tahoe below
- significantly reworked the ImplProcManager class. rather than subclassing
for each fuse implementation to be tested, the new version is based on
instantiating objects and providing relevant config info to the constructor.
this was motivated by a desire to eliminate the duplication of similar but
subtly different code between instances, framed by consideration of increasing
the number of platforms and implementations involved. each implementation to
test is thus reduced to the pertinent import and an entry in the
'implementations' table defining how to handle that implementation. this also
provides a way to specify which sets of tests to run for each implementation,
more on that below.
- significantly reworked the command line options parsing, using twisted.usage;
what used to be a single optional argument is now represented by the
--test-type option which allows one to choose between running unittests, the
system tests, or both.
the --implementations option allows for a specific (comma-separated) list of
implemenations to be tested, or the default 'all'
the --tests option allows for a specific (comma-separated) list of tests sets
to be run, or the default 'all'. note that only the intersection of tests
requested on the command line and tests relevant to each implementation will
be run. see below for more on tests sets.
the --path-to-tahoe open allows for the path to the 'tahoe' executable to be
specified. it defaults to '../../bin/tahoe' which is the location of the tahoe
script in the source tree relative to the contrib/fuse dir by default.
the --tmp-dir option controls where temporary directories (and hence
mountpoints) are created during the test. this defaults to /tmp - a change
from the previous behaviour of using the system default dir for calls to
tempfile.mkdtemp(), a behaviour which can be obtained by providing an empty
value, e.g. "--tmp-dir="
the --debug-wait flag causes the test runner to pause waiting upon user
input at various stages through the testing, which facilitates debugging e.g.
by allowing the user to open a browser and explore or modify the contents of
the ephemeral grid after it has been instantiated but before tests are run,
or make environmental adjustments before actually triggering fuse mounts etc.
note that the webapi url for the first client node is printed out upon its
startup to facilitate this sort of debugging also.
- the default tmp dir was changed, and made configurable. previously the
default behaviour of tempfile.mkdtemp() was used. it turns out that, at least
on the mac, that led to temporary directories to be created in a location
which ultimately led to mountpoint paths longer than could be handled by
macfuse - specifically mounted filesystems could not be unmounted and would
'leak'. by changing the default location to be rooted at /tmp this leads to
mountpoint paths short enough to be supported without problems.
- tests are now grouped into 'sets' by method name prefix. all the existing
tests have been moved into the 'read' set, i.e. with method names starting
'test_read_'. this is intended to facilitate the fact that some implementations
are read-only, and some support write, so the applicability of tests will vary
by implementation. the 'implementations' table, which governs the configuration
of the ImplProcManager responsible for a given implementation, provides a list
of 'test' (i.e test set names) which are applicable to that implementation.
note no 'write' tests yet exist, this is merely laying the groundwork.
- the 'expected output' of the tahoe command, which is checked for 'surprising'
output by regex match, can be confused by spurious output from libraries.
specfically, testing on the mac produced a warning message about zope interface
resolution various multiple eggs. the 'check_tahoe_output()' function now has
a list of 'ignorable_lines' (each a regex) which will be discarded before the
remainder of the output of the tahoe script is matched against expectation.
- cleaned up a typo, and a few spurious imports caught by pyflakes
robk-tahoe [Wed, 24 Sep 2008 18:28:54 +0000 (11:28 -0700)]
fuse/impl_{a,b}: improve node-url handling
specifically change the expectation of the code to be such that the node-url
(self.url) always includes the trailing slash to be a correctly formed url
moreover read the node-url from the 'node.url' file found in the node 'basedir'
and only if that doesn't exist, then fall back to reading the 'webport' file
from therein and assuming localhost. This then supports the general tahoe
pattern that tools needing only a webapi server can be pointed at a directory
containing the node.url file, which can optionally point to another server,
rather than requiring a complete node dir and locally running node instance.
robk-tahoe [Wed, 24 Sep 2008 18:07:38 +0000 (11:07 -0700)]
fuse/impl_b: tweaks from testing on hardy
from testing on linux (specifically ubuntu hardy) the libfuse dll has a
different name, specifically libfuse.so.2. this patch tries libfuse.so
and then falls back to trying .2 if the former fails.
it also changes the unmount behaviour, to simply return from the handler's
loop_forever() loop upon being unmounted, rather than raising an EOFError,
since none of the client code I looked at actually handled that exception,
but did seem to expect to fall off of main() when loop_forever() returned.
Additionally, from my testing unmount typically led to an OSError from the
fuse fd read, rather than an empty read, as the code seemed to expect.
also removed a spurious import pyflakes quibbled about.
robk-tahoe [Wed, 24 Sep 2008 17:42:55 +0000 (10:42 -0700)]
setup: fix site-dirs to find system installed twisted on mac.
zooko helped me unravel a build weirdness today. somehow the system installed
twisted (/System/Library) was pulling in parts of the other twisted (/Library)
which had been installed by easy_install, and exploding.
getting rid of the latter helped, but it took this change to get the tahoe
build to stop trying to rebuild twisted and instead use the one that was
already installed. c.f. tkt #229
robk-tahoe [Wed, 24 Sep 2008 16:45:23 +0000 (09:45 -0700)]
CLI: rework webopen, and moreover its tests w.r.t. path handling
in the recent reconciliation of webopen patches, I wound up adjusting
webopen to 'pass through' the state of the trailing slash on the given
argument to the resultant url passed to the browser. this change
removes the requirement that arguments must be directories, and allows
webopen to be used with files. it also broke the tests that assumed
that webopen would always normalise the url to have a trailing slash.
in fixing the tests, I realised that, IMHO, there's something deeply
awry with the way tahoe handles paths; specifically in the combination
of '/' being the name of the root path within an alias, but a leading
slash on paths, e.g. 'alias:/path', is catagorically incorrect. i.e.
'tahoe:' == 'tahoe:/' == '/'
but 'tahoe:/foo' is an invalid path, and must be 'tahoe:foo'
I wound up making the internals of webopen simply spot a 'path' of
'/' and smash it to '', which 'fixes' webopen to match the behaviour
of tahoe's path handling elsewhere, but that special case sort of
points to the weirdness.
(fwiw, I personally found the fact that the leading / in a path was
disallowed to be weird - I'm just used to seeing paths qualified by
the leading / I guess - so in a debate about normalising path handling
I'd vote to include the /)
robk-tahoe [Wed, 24 Sep 2008 15:20:02 +0000 (08:20 -0700)]
CLI: reconcile webopen changes
I think this is largely attributable to a cleanup patch I'd made
which never got committed upstream somehow, but at any rate various
conflicting changes to webopen had been made. This cleans up the
conflicts therein, and hopefully brings 'tahoe webopen' in line with
other cli commands.
robk-tahoe [Wed, 18 Jun 2008 20:19:40 +0000 (13:19 -0700)]
cli: cleanup webopen command
moved the body of webopen out of cli.py into tahoe_webopen.py
made its invocation consistent with the other cli commands, most
notably replacing its 'vdrive path' with the same alias parsing,
allowing usage such as 'tahoe webopen private:Pictures/xti'
robk-tahoe [Wed, 11 Jun 2008 00:31:45 +0000 (17:31 -0700)]
macapp: changed to remove 'Tahoe' from .app name
Change the build product from 'Allmydata Tahoe' to 'Allmydata'
more inkeeping with the branding of the Allmydata product
Brian Warner [Thu, 25 Sep 2008 01:03:02 +0000 (18:03 -0700)]
add --syslog argument to 'tahoe start' and 'tahoe restart', used to pass --syslog to twistd for non-Tahoe nodes (like cpu-watcher)
Brian Warner [Thu, 25 Sep 2008 00:47:16 +0000 (17:47 -0700)]
misc/make-canary-files.py: tool to create 'canary files', explained in the docstring
Brian Warner [Wed, 24 Sep 2008 20:35:05 +0000 (13:35 -0700)]
webapi: survive slashes in filenames better: make t=info and t=delete to work, and let t=rename fix the problem
Zooko O'Whielacronx [Wed, 24 Sep 2008 18:09:22 +0000 (11:09 -0700)]
setup: when detecting platform, ask the Python Standard Library's platform.dist() before executing lsb_release, and cache the result in global (module) variables
This should make it sufficiently fast, while still giving a better answer on Ubuntu than platform.dist() currently does, and also falling back to lsb_release if platform.dist() says that it doesn't know.
Brian Warner [Wed, 24 Sep 2008 17:51:12 +0000 (10:51 -0700)]
node.py: add BASEDIR/keepalive_timeout and BASEDIR/disconnect_timeout, to set/enable the foolscap timers, for #521
Zooko O'Whielacronx [Wed, 24 Sep 2008 00:04:02 +0000 (17:04 -0700)]
setup: stop catching EnvironmentError when attempting to copy ./_auto_deps.py to ./src/allmydata/_auto_deps.py
It is no longer the case that we can run okay without _auto_deps.py being in place in ./src/allmydata, so if that cp fails then the build should fail.
Zooko O'Whielacronx [Tue, 23 Sep 2008 19:26:10 +0000 (12:26 -0700)]
immutable: remove unused imports (thanks, pyflakes)
Zooko O'Whielacronx [Tue, 23 Sep 2008 18:52:49 +0000 (11:52 -0700)]
immutable: refactor immutable filenodes and comparison thereof
* the two kinds of immutable filenode now have a common base class
* they store only an instance of their URI, not both an instance and a string
* they delegate comparison to that instance
Zooko O'Whielacronx [Tue, 23 Sep 2008 17:14:31 +0000 (10:14 -0700)]
setup: try parsing /etc/lsb-release first, then invoking lsb_release, because the latter takes half-a-second on my workstation, which is too long
Also because in some cases the former will work and the latter won't.
This patch also tightens the regexes so it won't match random junk.
Zooko O'Whielacronx [Tue, 23 Sep 2008 16:55:51 +0000 (09:55 -0700)]
setup: fix a cut-and-paste error in the fallback to parsing /etc/lsb-release
Zooko O'Whielacronx [Tue, 23 Sep 2008 16:28:58 +0000 (09:28 -0700)]
setup: if executing lsb_release doesn't work, fall back to parsing /etc/lsb-release before falling back to platform.dist()
An explanatio of why we do it this way is in the docstring.
Zooko O'Whielacronx [Tue, 23 Sep 2008 15:48:20 +0000 (08:48 -0700)]
setup: if invoking lsb_release doesn't work (which it doesn't on our etch buildslave), then fall back to the Python Standard Library's platform.dist() function