On Mon, Oct 3, 2011 at 10:15 PM, Brion Vibber brion@wikimedia.org wrote:

I would *very* strongly recommend doing the internal refactoring before we get anywhere near reviewing and deploying that bad boy; otherwise we'll spend all the code review time pointing out things to refactor to avoid future maintenance problems. :)

I agree. The only question is whether the current system is running out of steam badly enough to require a two stage process. If the answer is "no, we're good", then definitely FileStore first.