summaryrefslogtreecommitdiff
path: root/python/pgq/cascade
diff options
context:
space:
mode:
authormartinko2013-03-06 16:47:36 +0000
committermartinko2013-03-06 16:47:36 +0000
commit5a53f0c62c7ef557280ed781e9d90182a064d426 (patch)
treecf61ffcc75ecf4f4f50bbe32221e8b17a659cbcc /python/pgq/cascade
parent611de298f91776b4d6cdf439395d5bd59d2e3f7c (diff)
python: text fixes
Diffstat (limited to 'python/pgq/cascade')
-rw-r--r--python/pgq/cascade/admin.py25
-rw-r--r--python/pgq/cascade/consumer.py3
2 files changed, 13 insertions, 15 deletions
diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index dd9215d8..61f1f448 100644
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -32,26 +32,26 @@ Node Initialization:
create-root NAME [PUBLIC_CONNSTR]
create-branch NAME [PUBLIC_CONNSTR] --provider=<public_connstr>
create-leaf NAME [PUBLIC_CONNSTR] --provider=<public_connstr>
- Initializes node.
+ All of the above initialize a node
Node Administration:
- pause Pause node worker.
- resume Resume node worker.
- wait-root Wait until node has catched up to root
- wait-provider Wait until node has catched up to provider
+ pause Pause node worker
+ resume Resume node worker
+ wait-root Wait until node has caught up with root
+ wait-provider Wait until node has caught up with provider
status Show cascade state
- node-status Show status of a local node
+ node-status Show status of local node
members Show members in set
Cascade layout change:
change-provider --provider NEW_NODE
Change where worker reads from
- takeover FROMNODE [--all] [--dead]
- Take other node position.
+ takeover FROM_NODE [--all] [--dead]
+ Take other node position
drop-node NAME
- Remove node from cascade.
+ Remove node from cascade
tag-dead NODE ..
Tag node as dead
@@ -64,7 +64,7 @@ standalone_usage = """
setadm extra switches:
pause/resume/change-provider:
- --node=NODENAME | --consumer=CONSUMER_NAME
+ --node=NODE_NAME | --consumer=CONSUMER_NAME
create-root/create-branch/create-leaf:
--worker=WORKER_NAME
@@ -595,7 +595,6 @@ class CascadeAdmin(skytools.AdminScript):
provider_node = node.provider_node
subscriber_list = self.get_node_subscriber_list(old_name)
-
# create copy of member info / subscriber+queue info
step1 = 'select * from pgq_node.rename_node_step1(%s, %s, %s)'
# rename node itself, drop copies
@@ -1220,7 +1219,7 @@ class CascadeAdmin(skytools.AdminScript):
#
# This is done snapshots, to make sure we delete only events
# that were dumped out previously. This uses the long-tx
- # resustant logic described in pgq.batch_event_sql().
+ # resistant logic described in pgq.batch_event_sql().
#
# find snapshots
@@ -1297,7 +1296,7 @@ class CascadeAdmin(skytools.AdminScript):
else:
sep = ','
- # create orinary dict to avoid problems with row class and datetime
+ # create ordinary dict to avoid problems with row class and datetime
d = {
'ev_id': ev.ev_id,
'ev_type': ev.ev_type,
diff --git a/python/pgq/cascade/consumer.py b/python/pgq/cascade/consumer.py
index 200de338..cc1bd7a9 100644
--- a/python/pgq/cascade/consumer.py
+++ b/python/pgq/cascade/consumer.py
@@ -41,7 +41,7 @@ class CascadedConsumer(BaseConsumer):
p.add_option("--rewind", action = "store_true",
help = "change queue position according to destination")
p.add_option("--reset", action = "store_true",
- help = "reset queue pos on destination side")
+ help = "reset queue position on destination side")
return p
def startup(self):
@@ -291,4 +291,3 @@ class CascadedConsumer(BaseConsumer):
self.log.warning("Failure to call pgq_node.set_consumer_error()")
self.reset()
BaseConsumer.exception_hook(self, det, emsg)
-