From: Mark Berger Date: Mon, 22 Apr 2013 06:37:39 +0000 (-0700) Subject: Allows check and deep-check to take multiple arguments (ticket #740) X-Git-Tag: allmydata-tahoe-1.10.1a1~222^2~1 X-Git-Url: https://git.rkrishnan.org/pf/content/en/footer/bar.txt?a=commitdiff_plain;h=bf235849c91e869c5f50f9da592438a77ecf1364;p=tahoe-lafs%2Ftahoe-lafs.git Allows check and deep-check to take multiple arguments (ticket #740) --- diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py index 6fb2e048..b0e4e6de 100644 --- a/src/allmydata/scripts/cli.py +++ b/src/allmydata/scripts/cli.py @@ -451,8 +451,8 @@ class CheckOptions(FilesystemOptions): ("repair", None, "Automatically repair any problems found."), ("add-lease", None, "Add/renew lease on all shares."), ] - def parseArgs(self, where=''): - self.where = argv_to_unicode(where) + def parseArgs(self, *locations): + self.locations = map(argv_to_unicode, locations) def getSynopsis(self): return "Usage: %s [global-opts] check [options] [ALIAS:PATH]" % (self.command_name,) @@ -470,8 +470,8 @@ class DeepCheckOptions(FilesystemOptions): ("add-lease", None, "Add/renew lease on all shares."), ("verbose", "v", "Be noisy about what is happening."), ] - def parseArgs(self, where=''): - self.where = argv_to_unicode(where) + def parseArgs(self, *locations): + self.locations = map(argv_to_unicode, locations) def getSynopsis(self): return "Usage: %s [global-opts] deep-check [options] [ALIAS:PATH]" % (self.command_name,) diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py index 23064359..4ac66921 100644 --- a/src/allmydata/scripts/tahoe_check.py +++ b/src/allmydata/scripts/tahoe_check.py @@ -15,13 +15,12 @@ def _quote_serverid_index_share(serverid, storage_index, sharenum): quote_output(storage_index, quotemarks=False), sharenum) -def check(options): +def check_location(options, where): stdout = options.stdout stderr = options.stderr nodeurl = options['node-url'] if not nodeurl.endswith("/"): nodeurl += "/" - where = options.where try: rootcap, path = get_alias(options.aliases, where, DEFAULT_ALIAS) except UnknownAliasError, e: @@ -96,10 +95,21 @@ def check(options): stdout.write(" corrupt shares:\n") for (serverid, storage_index, sharenum) in corrupt: stdout.write(" %s\n" % _quote_serverid_index_share(serverid, storage_index, sharenum)) + + return 0; +def check(options): + if len(options.locations) == 0: + errno = check_location(options, unicode()) + if errno != 0: + return errno + return 0 + for location in options.locations: + errno = check_location(options, location) + if errno != 0: + return errno return 0 - class FakeTransport: disconnecting = False @@ -262,7 +272,7 @@ class DeepCheckAndRepairOutput(LineOnlyReceiver): class DeepCheckStreamer(LineOnlyReceiver): - def run(self, options): + def deepcheck_location(self, options, where): stdout = options.stdout stderr = options.stderr self.rc = 0 @@ -271,7 +281,7 @@ class DeepCheckStreamer(LineOnlyReceiver): if not nodeurl.endswith("/"): nodeurl += "/" self.nodeurl = nodeurl - where = options.where + try: rootcap, path = get_alias(options.aliases, where, DEFAULT_ALIAS) except UnknownAliasError, e: @@ -309,6 +319,19 @@ class DeepCheckStreamer(LineOnlyReceiver): output.dataReceived(chunk) if not self.options["raw"]: output.done() + return 0 + + + def run(self, options): + if len(options.locations) == 0: + errno = self.deepcheck_location(options, unicode()) + if errno != 0: + return errno + return 0 + for location in options.locations: + errno = self.deepcheck_location(options, location) + if errno != 0: + return errno return self.rc def deepcheck(options):