2 patches for repository /home/zooko/playground/tahoe-lafs/1382-1363-merge-work/now_merge_1382_onto_1363_instead/really_about_to_Commit:
Mon Aug 1 11:48:53 PDT 2011 zooko@zooko.com
* remove get_serverid from DownloadStatus.add_block_request and customers
This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk.
Mon Aug 1 11:51:46 PDT 2011 zooko@zooko.com
* remove get_serverid from DownloadStatus.add_dyhb_request and customers
This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk.
refs #1363
New patches:
[remove get_serverid from DownloadStatus.add_block_request and customers
zooko@zooko.com**20110801184853
Ignore-this: 5469adc53b39bcc5e5163d66f2916dbb
This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk.
] {
hunk ./src/allmydata/immutable/downloader/share.py 729
share=repr(self),
start=start, length=length,
level=log.NOISY, parent=self._lp, umid="sgVAyA")
- block_ev = ds.add_block_request(self._server.get_serverid(),
- self._shnum,
+ block_ev = ds.add_block_request(self._server, self._shnum,
start, length, now())
d = self._send_request(start, length)
d.addCallback(self._got_data, start, length, block_ev, lp)
hunk ./src/allmydata/immutable/downloader/status.py 119
# self.block_requests tracks share-data requests and responses. It is
# a list of dicts:
- # serverid (binary),
+ # server (instance of IServer)
# shnum,
# start,length, (of data requested)
# start_time
hunk ./src/allmydata/immutable/downloader/status.py 171
self.dyhb_requests.append(r)
return DYHBEvent(r, self)
- def add_block_request(self, serverid, shnum, start, length, when):
- r = { "serverid": serverid,
+ def add_block_request(self, server, shnum, start, length, when):
+ r = { "server": server,
"shnum": shnum,
"start": start,
"length": length,
hunk ./src/allmydata/web/status.py 412
for ev in events:
# DownloadStatus promises to give us events in temporal order
ev = ev.copy()
- ev["serverid"] = base32.b2a(ev["serverid"])
+ ev["serverid"] = base32.b2a(ev["server"].get_serverid())
if ev["serverid"] not in serverid_to_group:
groupnum = len(serverid_to_group)
serverid_to_group[ev["serverid"]] = groupnum
hunk ./src/allmydata/web/status.py 582
T.th["txtime"], T.th["rxtime"],
T.th["received"], T.th["RTT"]]]
for r_ev in self.download_status.block_requests:
+ server = r_ev["server"]
rtt = None
if r_ev["finish_time"] is not None:
rtt = r_ev["finish_time"] - r_ev["start_time"]
hunk ./src/allmydata/web/status.py 586
- serverid_s = idlib.shortnodeid_b2a(r_ev["serverid"])
- t[T.tr(style="background: %s" % self.color(r_ev["serverid"]))[
- T.td[serverid_s], T.td[r_ev["shnum"]],
+ color = self.color(server.get_serverid())
+ t[T.tr(style="background: %s" % color)[
+ T.td[server.get_name()], T.td[r_ev["shnum"]],
T.td["[%d:+%d]" % (r_ev["start"], r_ev["length"])],
T.td[srt(r_ev["start_time"])], T.td[srt(r_ev["finish_time"])],
T.td[r_ev["response_length"] or ""],
}
[remove get_serverid from DownloadStatus.add_dyhb_request and customers
zooko@zooko.com**20110801185146
Ignore-this: 93385546dbb4044d0e277ee153215e69
This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk.
refs #1363
] {
hunk ./src/allmydata/immutable/downloader/finder.py 138
lp = self.log(format="sending DYHB to [%(name)s]", name=server.name(),
level=log.NOISY, umid="Io7pyg")
time_sent = now()
- d_ev = self._download_status.add_dyhb_request(server.get_serverid(),
- time_sent)
+ d_ev = self._download_status.add_dyhb_request(server, time_sent)
# TODO: get the timer from a Server object, it knows best
self.overdue_timers[req] = reactor.callLater(self.OVERDUE_TIMEOUT,
self.overdue, req)
hunk ./src/allmydata/immutable/downloader/status.py 110
# self.dyhb_requests tracks "do you have a share" requests and
# responses. It is a list of dicts:
- # serverid (binary)
+ # server (instance of IServer)
# start_time
# success (None until resolved, then boolean)
# response_shnums (tuple, None until successful)
hunk ./src/allmydata/immutable/downloader/status.py 161
self.segment_events.append(r)
return SegmentEvent(r, self)
- def add_dyhb_request(self, serverid, when):
- r = { "serverid": serverid,
+ def add_dyhb_request(self, server, when):
+ r = { "server": server,
"start_time": when,
"success": None,
"response_shnums": None,
hunk ./src/allmydata/test/test_web.py 77
def get_helper_info(self):
return (None, False)
+class FakeIServer:
+ def __init__(self, binaryserverid):
+ self.binaryserverid = binaryserverid
+ def get_name(self): return "short"
+ def get_longname(self): return "long"
+ def get_serverid(self): return self.binaryserverid
+
def build_one_ds():
ds = DownloadStatus("storage_index", 1234)
now = time.time()
hunk ./src/allmydata/test/test_web.py 88
- serverid_a = hashutil.tagged_hash("foo", "serverid_a")[:20]
- serverid_b = hashutil.tagged_hash("foo", "serverid_b")[:20]
+ serverA = FakeIServer(hashutil.tagged_hash("foo", "serverid_a")[:20])
+ serverB = FakeIServer(hashutil.tagged_hash("foo", "serverid_a")[:20])
storage_index = hashutil.storage_index_hash("SI")
e0 = ds.add_segment_request(0, now)
e0.activate(now+0.5)
hunk ./src/allmydata/test/test_web.py 106
e.activate(now)
e.deliver(now, 0, 140, 0.5)
- e = ds.add_dyhb_request(serverid_a, now)
+ e = ds.add_dyhb_request(serverA, now)
e.finished([1,2], now+1)
hunk ./src/allmydata/test/test_web.py 108
- e = ds.add_dyhb_request(serverid_b, now+2) # left unfinished
+ e = ds.add_dyhb_request(serverB, now+2) # left unfinished
e = ds.add_read_event(0, 120, now)
e.update(60, 0.5, 0.1) # bytes, decrypttime, pausetime
hunk ./src/allmydata/test/test_web.py 115
e.finished(now+1)
e = ds.add_read_event(120, 30, now+2) # left unfinished
- e = ds.add_block_request(serverid_a, 1, 100, 20, now)
+ e = ds.add_block_request(serverA, 1, 100, 20, now)
e.finished(20, now+1)
hunk ./src/allmydata/test/test_web.py 117
- e = ds.add_block_request(serverid_a, 1, 120, 30, now+1) # left unfinished
+ e = ds.add_block_request(serverB, 1, 120, 30, now+1) # left unfinished
# make sure that add_read_event() can come first too
ds1 = DownloadStatus(storage_index, 1234)
hunk ./src/allmydata/test/test_web.py 585
# serverids[] keys are strings, since that's what JSON does, but
# we'd really like them to be ints
self.failUnlessEqual(data["serverids"]["0"], "phwr")
- self.failUnlessEqual(data["serverids"]["1"], "cmpu")
+ self.failUnless(data["serverids"].has_key("1"), data["serverids"])
+ self.failUnlessEqual(data["serverids"]["1"], "cmpu", data["serverids"])
self.failUnlessEqual(data["server_info"][phwr_id]["short"], "phwr")
self.failUnlessEqual(data["server_info"][cmpu_id]["short"], "cmpu")
self.failUnless("dyhb" in data)
hunk ./src/allmydata/web/status.py 361
def _find_overlap(self, events, start_key, end_key):
# given a list of event dicts, return a new list in which each event
- # has an extra "row" key (an int, starting at 0). This is a hint to
- # our JS frontend about how to overlap the parts of the graph it is
- # drawing.
+ # has an extra "row" key (an int, starting at 0), and if appropriate
+ # a "serverid" key (ascii-encoded server id), replacing the "server"
+ # key. This is a hint to our JS frontend about how to overlap the
+ # parts of the graph it is drawing.
hunk ./src/allmydata/web/status.py 366
- # we must always make a copy, since we're going to be adding "row"
- # keys and don't want to change the original objects. If we're
+ # we must always make a copy, since we're going to be adding keys
+ # and don't want to change the original objects. If we're
# stringifying serverids, we'll also be changing the serverid keys.
new_events = []
rows = []
hunk ./src/allmydata/web/status.py 373
for ev in events:
ev = ev.copy()
- if "serverid" in ev:
- ev["serverid"] = base32.b2a(ev["serverid"])
+ if ev.has_key('server'):
+ ev["serverid"] = base32.b2a(ev["server"].get_serverid())
+ del ev["server"]
# find an empty slot in the rows
free_slot = None
for row,finished in enumerate(rows):
hunk ./src/allmydata/web/status.py 415
# DownloadStatus promises to give us events in temporal order
ev = ev.copy()
ev["serverid"] = base32.b2a(ev["server"].get_serverid())
+ del ev["server"]
if ev["serverid"] not in serverid_to_group:
groupnum = len(serverid_to_group)
serverid_to_group[ev["serverid"]] = groupnum
hunk ./src/allmydata/web/status.py 499
t[T.tr[T.th["serverid"], T.th["sent"], T.th["received"],
T.th["shnums"], T.th["RTT"]]]
for d_ev in self.download_status.dyhb_requests:
- serverid = d_ev["serverid"]
+ server = d_ev["server"]
sent = d_ev["start_time"]
shnums = d_ev["response_shnums"]
received = d_ev["finish_time"]
hunk ./src/allmydata/web/status.py 503
- serverid_s = idlib.shortnodeid_b2a(serverid)
rtt = None
if received is not None:
rtt = received - sent
hunk ./src/allmydata/web/status.py 508
if not shnums:
shnums = ["-"]
- t[T.tr(style="background: %s" % self.color(serverid))[
- [T.td[serverid_s], T.td[srt(sent)], T.td[srt(received)],
+ t[T.tr(style="background: %s" % self.color(server.get_serverid()))[
+ [T.td[server.get_name()], T.td[srt(sent)], T.td[srt(received)],
T.td[",".join([str(shnum) for shnum in shnums])],
T.td[self.render_time(None, rtt)],
]]]
}
Context:
[test_cli.py: use to_str on fields loaded using simplejson.loads in new tests. refs #1304
david-sarah@jacaranda.org**20110730032521
Ignore-this: d1d6dfaefd1b4e733181bf127c79c00b
]
[cli: make 'tahoe cp' overwrite mutable files in-place
Kevan Carstensen <kevan@isnotajoke.com>**20110729202039
Ignore-this: b2ad21a19439722f05c49bfd35b01855
]
[SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. Also change the lines of the error messages to end in CRLF, and take into account Kevan's review comments. fixes #1442, #1446
david-sarah@jacaranda.org**20110729233102
Ignore-this: d2f2bb4664f25007d1602bf7333e2cdd
]
[src/allmydata/scripts/cli.py: fix pyflakes warning.
david-sarah@jacaranda.org**20110728021402
Ignore-this: 94050140ddb99865295973f49927c509
]
[Fix the help synopses of CLI commands to include [options] in the right place. fixes #1359, fixes #636
david-sarah@jacaranda.org**20110724225440
Ignore-this: 2a8e488a5f63dabfa9db9efd83768a5
]
[encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120
david-sarah@jacaranda.org**20110629185356
Ignore-this: 5ebacbe6903dfa83ffd3ff8436a97787
]
[docs/man/tahoe.1: add man page. fixes #1420
david-sarah@jacaranda.org**20110724171728
Ignore-this: fc7601ec7f25494288d6141d0ae0004c
]
[Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435
david-sarah@jacaranda.org**20110721234941
Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9
]
[frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it.
david-sarah@jacaranda.org**20110722000320
Ignore-this: 55cd558b791526113db3f83c00ec328a
]
[Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429
david-sarah@jacaranda.org**20110721233658
Ignore-this: 81b41745477163c9b39c0b59db91cc62
]
[misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334
david-sarah@jacaranda.org**20110722035402
Ignore-this: 5d03f544c4154f088e26c7107494bf39
]
[misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334
david-sarah@jacaranda.org**20110722024907
Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c
]
[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
david-sarah@jacaranda.org**20110718005949
Ignore-this: 81837fbce073e93d88a3e7ae3122458c
]
[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
david-sarah@jacaranda.org**20110717194315
Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
]
[README.txt: say that quickstart.rst is in the docs directory.
david-sarah@jacaranda.org**20110717192400
Ignore-this: bc6d35a85c496b77dbef7570677ea42a
]
[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
david-sarah@jacaranda.org**20110716181813
Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
]
[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
zooko@zooko.com**20110717114226
Ignore-this: df222120d41447ce4102616921626c82
fixes #1383
]
[docs: add missing link in NEWS.rst
zooko@zooko.com**20110712153307
Ignore-this: be7b7eb81c03700b739daa1027d72b35
]
[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
zooko@zooko.com**20110712153229
Ignore-this: 723c4f9e2211027c79d711715d972c5
Also remove a couple of vestigial references to figleaf, which is long gone.
fixes #1409 (remove contrib/fuse)
]
[add Protovis.js-based download-status timeline visualization
Brian Warner <warner@lothar.com>**20110629222606
Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
provide status overlap info on the webapi t=json output, add decode/decrypt
rate tooltips, add zoomin/zoomout buttons
]
[add more download-status data, fix tests
Brian Warner <warner@lothar.com>**20110629222555
Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
]
[prepare for viz: improve DownloadStatus events
Brian Warner <warner@lothar.com>**20110629222542
Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
]
[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
zooko@zooko.com**20110629185711
Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
]
[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
david-sarah@jacaranda.org**20110130235809
Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
]
[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
david-sarah@jacaranda.org**20110626054124
Ignore-this: abb864427a1b91bd10d5132b4589fd90
]
[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
david-sarah@jacaranda.org**20110623205528
Ignore-this: c63e23146c39195de52fb17c7c49b2da
]
[Rename test_package_initialization.py to (much shorter) test_import.py .
Brian Warner <warner@lothar.com>**20110611190234
Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
The former name was making my 'ls' listings hard to read, by forcing them
down to just two columns.
]
[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
zooko@zooko.com**20110611163741
Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
fixes #1412
]
[wui: right-align the size column in the WUI
zooko@zooko.com**20110611153758
Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
fixes #1412
]
[docs: three minor fixes
zooko@zooko.com**20110610121656
Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
CREDITS for arc for stats tweak
fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
English usage tweak
]
[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
david-sarah@jacaranda.org**20110609223719
Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
]
[server.py: get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
wilcoxjg@gmail.com**20110527120135
Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
interfaces.py: modified the return type of RIStatsProvider.get_stats to allow for None as a return value
NEWS.rst, stats.py: documentation of change to get_latencies
stats.rst: now documents percentile modification in get_latencies
test_storage.py: test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
fixes #1392
]
[corrected "k must never be smaller than N" to "k must never be greater than N"
secorp@allmydata.org**20110425010308
Ignore-this: 233129505d6c70860087f22541805eac
]
[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
david-sarah@jacaranda.org**20110517011214
Ignore-this: 6a5be6e70241e3ec0575641f64343df7
]
[docs: convert NEWS to NEWS.rst and change all references to it.
david-sarah@jacaranda.org**20110517010255
Ignore-this: a820b93ea10577c77e9c8206dbfe770d
]
[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
david-sarah@jacaranda.org**20110512140559
Ignore-this: 784548fc5367fac5450df1c46890876d
]
[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
david-sarah@jacaranda.org**20110130164923
Ignore-this: a271e77ce81d84bb4c43645b891d92eb
]
[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
zooko@zooko.com**20110128142006
Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
]
[M-x whitespace-cleanup
zooko@zooko.com**20110510193653
Ignore-this: dea02f831298c0f65ad096960e7df5c7
]
[docs: fix typo in running.rst, thanks to arch_o_median
zooko@zooko.com**20110510193633
Ignore-this: ca06de166a46abbc61140513918e79e8
]
[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
david-sarah@jacaranda.org**20110204204902
Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
]
[relnotes.txt: forseeable -> foreseeable. refs #1342
david-sarah@jacaranda.org**20110204204116
Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
]
[replace remaining .html docs with .rst docs
zooko@zooko.com**20110510191650
Ignore-this: d557d960a986d4ac8216d1677d236399
Remove install.html (long since deprecated).
Also replace some obsolete references to install.html with references to quickstart.rst.
Fix some broken internal references within docs/historical/historical_known_issues.txt.
Thanks to Ravi Pinjala and Patrick McDonald.
refs #1227
]
[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
]
[munin tahoe_files plugin: fix incorrect file count
francois@ctrlaltdel.ch**20110428055312
Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
fixes #1391
]
[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 <warner@lothar.com>**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 <warner@lothar.com>**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 <warner@lothar.com>"**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 <warner@lothar.com>**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:
3e97703af3a72ff38d93a6769691a8d84548c434