1 patch for repository zooko@dev.allmydata.org:/home/darcs/tahoe/trunk: Sun May 8 06:42:28 MDT 2011 zooko@zooko.com * docs: fix several imprecise or inaccurate values in performance.rst add cpu values for each operation sort the list of values into the same order in each operation refs #1398 New patches: [docs: fix several imprecise or inaccurate values in performance.rst zooko@zooko.com**20110508124228 Ignore-this: f1ecc5cb32eebec9760c8fc437799eb4 add cpu values for each operation sort the list of values into the same order in each operation refs #1398 ] { hunk ./docs/performance.rst 50 network: ~N -memory footprint: N/K*S +memory footprint: S when the file is not already uploaded ------------------------------------- hunk ./docs/performance.rst 65 cpu: 2*~A -network: ~N + ~A +network: N/K*A memory footprint: N/K*S hunk ./docs/performance.rst 72 Publishing an ``A``-byte mutable file ===================================== +cpu: ~A + a large constant for RSA keypair generation + network: A memory footprint: N/K*A hunk ./docs/performance.rst 78 -cpu: ~A + a large constant for RSA keypair generation - notes: Tahoe-LAFS generates a new RSA keypair for each mutable file that it publishes to a grid. This takes up to 1 or 2 seconds on a typical desktop PC. hunk ./docs/performance.rst 89 Downloading ``B`` bytes of an ``A``-byte immutable file ======================================================= -network: B +cpu: ~B hunk ./docs/performance.rst 91 -cpu: ~A +network: B notes: When Tahoe-LAFS 1.8.0 or later is asked to read an arbitrary range of an immutable file, only the S-byte segments that overlap the hunk ./docs/performance.rst 104 Downloading ``B`` bytes of an ``A``-byte mutable file ===================================================== +cpu: ~A + network: A memory footprint: A hunk ./docs/performance.rst 117 Modifying ``B`` bytes of an ``A``-byte mutable file =================================================== +cpu: ~A + network: A memory footprint: N/K*A hunk ./docs/performance.rst 134 Inserting/Removing ``B`` bytes in an ``A``-byte mutable file ============================================================ +cpu: ~A + network: A memory footprint: N/K*A hunk ./docs/performance.rst 153 Adding an entry to an ``A``-entry directory =========================================== +cpu: ~A + network: ~A hunk ./docs/performance.rst 157 -memory footprint: N/K*A +memory footprint: N/K*~A notes: In Tahoe-LAFS, directories are implemented as specialized mutable files. So adding an entry to a directory is essentially adding B hunk ./docs/performance.rst 166 Listing an ``A`` entry directory ================================ +cpu: ~A + network: ~A hunk ./docs/performance.rst 170 -memory footprint: N/K*A +memory footprint: N/K*~A notes: Listing a directory requires that the mutable file storing the directory be downloaded from the grid. So listing an A entry hunk ./docs/performance.rst 180 Performing a file-check on an ``A``-byte file ============================================= -network: ~G, where G is the number of servers on your grid +cpu: ~G + +network: ~G memory footprint: negligible hunk ./docs/performance.rst 194 Performing a file-verify on an ``A``-byte file ============================================== +cpu: ~N/K*A + network: N/K*A memory footprint: N/K*S hunk ./docs/performance.rst 201 notes: To verify a file, Tahoe-LAFS downloads all of the ciphertext -shares that were originally uploaded to the grid and integrity -checks them. This is, for well-behaved grids, likely to be more -expensive than downloading an A-byte file, since only a fraction -of these shares are necessary to recover the file. +shares that were originally uploaded to the grid and integrity checks +them. This is (for well-behaved grids) more expensive than downloading +an A-byte file, since only a fraction of these shares are necessary to +recover the file. Repairing an ``A``-byte file (mutable or immutable) =================================================== hunk ./docs/performance.rst 209 -network: variable; up to around ~A +cpu: variable, between ~A and ~N/K*A + +network: variable; between A and N/K*A hunk ./docs/performance.rst 213 -memory footprint: from S to (1+N/K)*S +memory footprint: (1+N/K)*S hunk ./docs/performance.rst 215 -notes: To repair a file, Tahoe-LAFS downloads the file, and generates/uploads -missing shares in the same way as when it initially uploads the file. -So, depending on how many shares are missing, this can be about as -expensive as initially uploading the file in the first place. +notes: To repair a file, Tahoe-LAFS downloads the file, and +generates/uploads missing shares in the same way as when it initially +uploads the file. So, depending on how many shares are missing, this +can cost as little as a download or as much as a download followed by +a full upload. } Context: [munin tahoe_files plugin: fix incorrect file count francois@ctrlaltdel.ch**20110428055312 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34 fixes #1391 ] [docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297 zooko@zooko.com**20110428055232 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39 ] [Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389 david-sarah@jacaranda.org**20110411190738 Ignore-this: 7847d26bc117c328c679f08a7baee519 ] [tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389 david-sarah@jacaranda.org**20110410155844 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa ] [allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389 david-sarah@jacaranda.org**20110410155705 Ignore-this: 2f87b8b327906cf8bfca9440a0904900 ] [remove unused variable detected by pyflakes zooko@zooko.com**20110407172231 Ignore-this: 7344652d5e0720af822070d91f03daf9 ] [allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388 david-sarah@jacaranda.org**20110401202750 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f ] [update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1 Brian Warner **20110325232511 Ignore-this: d5307faa6900f143193bfbe14e0f01a ] [control.py: remove all uses of s.get_serverid() warner@lothar.com**20110227011203 Ignore-this: f80a787953bd7fa3d40e828bde00e855 ] [web: remove some uses of s.get_serverid(), not all warner@lothar.com**20110227011159 Ignore-this: a9347d9cf6436537a47edc6efde9f8be ] [immutable/downloader/fetcher.py: remove all get_serverid() calls warner@lothar.com**20110227011156 Ignore-this: fb5ef018ade1749348b546ec24f7f09a ] [immutable/downloader/fetcher.py: fix diversity bug in server-response handling warner@lothar.com**20110227011153 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the _shares_from_server dict was being popped incorrectly (using shnum as the index instead of serverid). I'm still thinking through the consequences of this bug. It was probably benign and really hard to detect. I think it would cause us to incorrectly believe that we're pulling too many shares from a server, and thus prefer a different server rather than asking for a second share from the first server. The diversity code is intended to spread out the number of shares simultaneously being requested from each server, but with this bug, it might be spreading out the total number of shares requested at all, not just simultaneously. (note that SegmentFetcher is scoped to a single segment, so the effect doesn't last very long). ] [immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps warner@lothar.com**20110227011150 Ignore-this: d8d56dd8e7b280792b40105e13664554 test_download.py: create+check MyShare instances better, make sure they share Server objects, now that finder.py cares ] [immutable/downloader/finder.py: reduce use of get_serverid(), one left warner@lothar.com**20110227011146 Ignore-this: 5785be173b491ae8a78faf5142892020 ] [immutable/offloaded.py: reduce use of get_serverid() a bit more warner@lothar.com**20110227011142 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f ] [immutable/upload.py: reduce use of get_serverid() warner@lothar.com**20110227011138 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6 ] [immutable/checker.py: remove some uses of s.get_serverid(), not all warner@lothar.com**20110227011134 Ignore-this: e480a37efa9e94e8016d826c492f626e ] [add remaining get_* methods to storage_client.Server, NoNetworkServer, and warner@lothar.com**20110227011132 Ignore-this: 6078279ddf42b179996a4b53bee8c421 MockIServer stubs ] [upload.py: rearrange _make_trackers a bit, no behavior changes warner@lothar.com**20110227011128 Ignore-this: 296d4819e2af452b107177aef6ebb40f ] [happinessutil.py: finally rename merge_peers to merge_servers warner@lothar.com**20110227011124 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e ] [test_upload.py: factor out FakeServerTracker warner@lothar.com**20110227011120 Ignore-this: 6c182cba90e908221099472cc159325b ] [test_upload.py: server-vs-tracker cleanup warner@lothar.com**20110227011115 Ignore-this: 2915133be1a3ba456e8603885437e03 ] [happinessutil.py: server-vs-tracker cleanup warner@lothar.com**20110227011111 Ignore-this: b856c84033562d7d718cae7cb01085a9 ] [upload.py: more tracker-vs-server cleanup warner@lothar.com**20110227011107 Ignore-this: bb75ed2afef55e47c085b35def2de315 ] [upload.py: fix var names to avoid confusion between 'trackers' and 'servers' warner@lothar.com**20110227011103 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d ] [refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload warner@lothar.com**20110227011100 Ignore-this: 7ea858755cbe5896ac212a925840fe68 No behavioral changes, just updating variable/method names and log messages. The effects outside these three files should be minimal: some exception messages changed (to say "server" instead of "peer"), and some internal class names were changed. A few things still use "peer" to minimize external changes, like UploadResults.timings["peer_selection"] and happinessutil.merge_peers, which can be changed later. ] [storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers warner@lothar.com**20110227011056 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc ] [test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code warner@lothar.com**20110227011051 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d ] [test: increase timeout on a network test because Francois's ARM machine hit that timeout zooko@zooko.com**20110317165909 Ignore-this: 380c345cdcbd196268ca5b65664ac85b I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish. ] [docs/configuration.rst: add a "Frontend Configuration" section Brian Warner **20110222014323 Ignore-this: 657018aa501fe4f0efef9851628444ca this points to docs/frontends/*.rst, which were previously underlinked ] [web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366 "Brian Warner "**20110221061544 Ignore-this: 799d4de19933f2309b3c0c19a63bb888 ] [Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable. david-sarah@jacaranda.org**20110221015817 Ignore-this: 51d181698f8c20d3aca58b057e9c475a ] [allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355. david-sarah@jacaranda.org**20110221020125 Ignore-this: b0744ed58f161bf188e037bad077fc48 ] [Refactor StorageFarmBroker handling of servers Brian Warner **20110221015804 Ignore-this: 842144ed92f5717699b8f580eab32a51 Pass around IServer instance instead of (peerid, rref) tuple. Replace "descriptor" with "server". Other replacements: get_all_servers -> get_connected_servers/get_known_servers get_servers_for_index -> get_servers_for_psi (now returns IServers) This change still needs to be pushed further down: lots of code is now getting the IServer and then distributing (peerid, rref) internally. Instead, it ought to distribute the IServer internally and delay extracting a serverid or rref until the last moment. no_network.py was updated to retain parallelism. ] [TAG allmydata-tahoe-1.8.2 warner@lothar.com**20110131020101] Patch bundle hash: c186bd210fda18a13b86d75683e3bd8ca0b7c2df