1 patch for repository http://tahoe-lafs.org/source/tahoe-lafs/trunk-hashedformat: Mon Sep 27 13:01:02 PDT 2010 Kevan Carstensen * immutable/repairer.py: don't use the default happiness setting when repairing New patches: [immutable/repairer.py: don't use the default happiness setting when repairing Kevan Carstensen **20100927200102 Ignore-this: bd704d9744b970849da8d46a16b8089a ] { hunk ./src/allmydata/immutable/repairer.py 60 vcap = self._filenode.get_verify_cap() k = vcap.needed_shares N = vcap.total_shares - happy = upload.BaseUploadable.default_encoding_param_happy + # Per ticket #1212 + # (http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1212) + happy = 0 self._encodingparams = (k, happy, N, segsize) ul = upload.CHKUploader(self._storage_broker, self._secret_holder) return ul.start(self) # I am the IEncryptedUploadable hunk ./src/allmydata/test/test_repairer.py 519 self.failUnlessEqual(newdata, common.TEST_DATA)) return d + def test_repairer_servers_of_happiness(self): + # The repairer is supposed to generate and place as many of the + # missing shares as possible without caring about how they are + # distributed. + self.basedir = "repairer/Repairer/repairer_servers_of_happiness" + self.set_up_grid(num_clients=2, num_servers=10) + d = self.upload_and_stash() + # Now delete some servers. We want to leave 3 servers, which + # will allow us to restore the file to a healthy state without + # distributing the shares widely enough to satisfy the default + # happiness setting. + def _delete_some_servers(ignored): + for i in xrange(7): + self.g.remove_server(self.g.servers_by_number[i].my_nodeid) + + assert len(self.g.servers_by_number) == 3 + + d.addCallback(_delete_some_servers) + # Now try to repair the file. + d.addCallback(lambda ignored: + self.c0_filenode.check_and_repair(Monitor(), verify=False)) + def _check_results(crr): + self.failUnlessIsInstance(crr, + check_results.CheckAndRepairResults) + pre = crr.get_pre_repair_results() + post = crr.get_post_repair_results() + for p in (pre, post): + self.failUnlessIsInstance(p, check_results.CheckResults) + + self.failIf(pre.is_healthy()) + self.failUnless(post.is_healthy()) + + d.addCallback(_check_results) + return d + # why is test_repair_from_corruption_of_1 disabled? Read on: # # As recently documented in NEWS for the 1.3.0 release, the current } Context: [NEWS: note dependency updates to pycryptopp and pycrypto. david-sarah@jacaranda.org**20100924191207 Ignore-this: eeaf5c9c9104f24c450c2ec4482ac1ee ] [TAG allmydata-tahoe-1.8.0 zooko@zooko.com**20100924021631 Ignore-this: 494ca0a885c5e20c883845fc53e7ab5d ] Patch bundle hash: b839e041e04283d24703bc98b7e07b3278cc38ad