diff options
| author | Alan Conway <aconway@apache.org> | 2012-05-15 21:05:34 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-05-15 21:05:34 +0000 |
| commit | 64b1869ab0a626202cd2e9319245ca50c7796333 (patch) | |
| tree | 53cef63cc3eefcb6c3324e0eba5dbcf0ef0a1209 /tools | |
| parent | ab3045a16ae3cb19fb44d001953f491b79227420 (diff) | |
| download | qpid-python-64b1869ab0a626202cd2e9319245ca50c7796333.tar.gz | |
QPID-3603: HA broker backup/primary ready checks.
- Introduce HA broker state machien
- Inform backup queues when ready.
- Incomplete implementation of backup ready check.
- does not count correctly after a failover, see countUnready.
- Existing replicator bridges updated out of sync with BrokerReplicator initialize.
- Does not handle multi-messages responses.
- Newly promoted HA primary waits for backups to be ready before accepting clients.
- Uniform log prefixes for HA messages.
- qpid-ha tests, call qpid-ha python code directly.
- Move excluder from Backup to HaBroker, it is also used in PROMOTING.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1338889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/src/py/qpid-ha | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/src/py/qpid-ha b/tools/src/py/qpid-ha index bd8040cfbe..6fee0204e7 100755 --- a/tools/src/py/qpid-ha +++ b/tools/src/py/qpid-ha @@ -35,18 +35,18 @@ HA_BROKER = "org.apache.qpid.ha:habroker:ha-broker" class Command: commands = {} - def __init__(self, name, help, args=[]): + def __init__(self, name, help, arg_names=[]): Command.commands[name] = self self.name = name - self.args = args - usage="%s [options] %s\n\n%s"%(name, " ".join(args), help) + self.arg_names = arg_names + usage="%s [options] %s\n\n%s"%(name, " ".join(arg_names), help) self.help = help self.op=optparse.OptionParser(usage) self.op.add_option("-b", "--broker", metavar="<url>", help="Connect to broker at <url>") - def execute(self): - opts, args = self.op.parse_args() - if len(args) != len(self.args)+1: + def execute(self, args): + opts, args = self.op.parse_args(args) + if len(args) != len(self.arg_names)+1: self.op.print_help() raise Exception("Wrong number of arguments") broker = opts.broker or "localhost:5672" @@ -144,7 +144,7 @@ def main(argv): if not command: print_usage(os.path.basename(argv[0])); return 1; - if command.execute(): return 1 + if command.execute(args): return 1 except Exception, e: print e return 1 |
