From 15ef9f624de454c3073b99933e528e64af477584 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Mon, 24 Mar 2008 18:55:37 -0700 Subject: [PATCH] encode: log a plaintext hash and SI for each upload. This will allow the log gatherer to correlate the two, to better measure the benefits of convergence --- src/allmydata/encode.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/allmydata/encode.py b/src/allmydata/encode.py index 2a95cabb..36656fdb 100644 --- a/src/allmydata/encode.py +++ b/src/allmydata/encode.py @@ -514,13 +514,18 @@ class Encoder(object): self.set_encode_and_push_progress(extra=0.0) crypttext_hash = self._crypttext_hasher.digest() self.uri_extension_data["crypttext_hash"] = crypttext_hash - d = defer.succeed(None) + d = self._uploadable.get_plaintext_hash() + def _got(plaintext_hash): + self.log(format="plaintext_hash=%(plaintext_hash)s, SI=%(SI)s", + plaintext_hash=base32.b2a(plaintext_hash), + SI=storage.si_b2a(self._storage_index) ) + return plaintext_hash + d.addCallback(_got) if self.USE_PLAINTEXT_HASHES: - d.addCallback(lambda res: self._uploadable.get_plaintext_hash()) - def _got(plaintext_hash): + def _use_plaintext_hash(plaintext_hash): self.uri_extension_data["plaintext_hash"] = plaintext_hash return self._uploadable.get_plaintext_hashtree_leaves(0, self.num_segments, self.num_segments) - d.addCallback(_got) + d.addCallback(_use_plaintext_hash) def _got_hashtree_leaves(leaves): self.log("Encoder: got plaintext_hashtree_leaves: %s" % (",".join([base32.b2a(h) for h in leaves]),), -- 2.45.2