You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2018/12/12 17:55:01 UTC
qpid-dispatch git commit: NO-JIRA - Cleanup of qdstat tool and its
man page.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 15b70c433 -> 4742c4bfd
NO-JIRA - Cleanup of qdstat tool and its man page.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4742c4bf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4742c4bf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4742c4bf
Branch: refs/heads/master
Commit: 4742c4bfd579f1bcdd471def084317a49a16172a
Parents: 15b70c4
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Dec 12 12:42:13 2018 -0500
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Dec 12 12:47:13 2018 -0500
----------------------------------------------------------------------
docs/man/qdstat.8.adoc | 11 +++++++++++
tests/system_tests_qdstat.py | 4 ++--
tools/qdstat.in | 8 ++++----
3 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4742c4bf/docs/man/qdstat.8.adoc
----------------------------------------------------------------------
diff --git a/docs/man/qdstat.8.adoc b/docs/man/qdstat.8.adoc
index bd62be4..42491a2 100644
--- a/docs/man/qdstat.8.adoc
+++ b/docs/man/qdstat.8.adoc
@@ -69,6 +69,9 @@ The security or encryption method, if any, used for this connection.
authentication::
The authentication method and user ID of the connection's authenticated user.
+tenant::
+If the connection is to a listener using multi-tenancy, this column displays the tenant namespace for the connection.
+
qdstat -l
~~~~~~~~~
type::
@@ -111,6 +114,10 @@ The phase of the address bound to the link.
cap::
The capacity, in deliveries, of the link.
+pri::
+The priority of the link. Priority influences the order in which links are processed within a connection.
+Higher numbers represent higher priorities.
+
undel::
The number of undelivered messages stored on the link's FIFO.
@@ -197,6 +204,10 @@ One of the following distribution methods used for this address:
- 'balanced' - Each message is delivered to only one consumer for the address. The consumer with the fewest outstanding (unsettled) deliveries will be chosen. The cost of the route to the consumer is a threshold for delivery (that is, higher cost consumers will only receive deliveries if closer consumers are backed up).
- 'flood' - Used only for router-control traffic. This is multicast without the prevention of duplicate deliveries.
+pri::
+The priority of the address. If the address prefix/pattern is configured with a priority, that priority will appear
+in this column. Messages for addresses configured with a priority will be forwarded according to the address's priority.
+
in-proc::
The number of in-process consumers for this address.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4742c4bf/tests/system_tests_qdstat.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py
index aa32b41..3ce9cf1 100644
--- a/tests/system_tests_qdstat.py
+++ b/tests/system_tests_qdstat.py
@@ -95,7 +95,7 @@ class QdstatTest(system_test.TestCase):
self.assertGreaterEqual(len(lines), 2)
# see if the header line has the word priority in it
- priorityregexp = r'priority'
+ priorityregexp = r'pri'
priority_column = re.search(priorityregexp, lines[1]).start()
self.assertGreater(priority_column, -1)
@@ -167,7 +167,7 @@ class QdstatLinkPriorityTest(system_test.TestCase):
self.assertGreaterEqual(len(lines), 2)
# see if the header line has the word priority in it
- priorityregexp = r'priority'
+ priorityregexp = r'pri'
priority_column = re.search(priorityregexp, lines[1]).start()
self.assertGreater(priority_column, -1)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4742c4bf/tools/qdstat.in
----------------------------------------------------------------------
diff --git a/tools/qdstat.in b/tools/qdstat.in
index 6e2f2ab..194baf0 100755
--- a/tools/qdstat.in
+++ b/tools/qdstat.in
@@ -343,6 +343,7 @@ class BusManager(Node):
heads.append(Header("addr"))
heads.append(Header("phs"))
heads.append(Header("cap"))
+ heads.append(Header("pri"))
heads.append(Header("undel"))
heads.append(Header("unsett"))
heads.append(Header("del"))
@@ -373,7 +374,6 @@ class BusManager(Node):
heads.append(Header("mod"))
heads.append(Header("admin"))
heads.append(Header("oper"))
- heads.append(Header("priority"))
if self.opts.verbose:
heads.append(Header("name"))
@@ -388,6 +388,7 @@ class BusManager(Node):
row.append(self._addr_text(link.owningAddr))
row.append(self._addr_phase(link.owningAddr))
row.append(link.capacity)
+ row.append(link.priority)
row.append(link.undeliveredCount)
row.append(link.unsettledCount)
row.append(link.deliveryCount)
@@ -400,7 +401,6 @@ class BusManager(Node):
row.append(link.modifiedCount)
row.append(link.adminStatus)
row.append(link.operStatus)
- row.append(link.priority)
if self.opts.verbose:
row.append(link.linkName)
rows.append(row)
@@ -463,6 +463,7 @@ class BusManager(Node):
heads.append(Header("addr"))
heads.append(Header("phs"))
heads.append(Header("distrib"))
+ heads.append(Header("pri"))
heads.append(Header("in-proc", Header.COMMAS))
heads.append(Header("local", Header.COMMAS))
heads.append(Header("remote", Header.COMMAS))
@@ -472,7 +473,6 @@ class BusManager(Node):
heads.append(Header("thru", Header.COMMAS))
heads.append(Header("to-proc", Header.COMMAS))
heads.append(Header("from-proc", Header.COMMAS))
- heads.append(Header("priority"))
rows = []
cols = ('distribution', 'inProcess', 'subscriberCount', 'remoteCount',
'containerCount', 'deliveriesIngress', 'deliveriesEgress',
@@ -486,6 +486,7 @@ class BusManager(Node):
row.append(self._addr_text(addr.name))
row.append(self._addr_phase(addr.name))
row.append(addr.distribution)
+ row.append(addr.priority if addr.priority >= 0 else "")
row.append(addr.inProcess)
row.append(addr.subscriberCount)
row.append(addr.remoteCount)
@@ -495,7 +496,6 @@ class BusManager(Node):
row.append(addr.deliveriesTransit)
row.append(addr.deliveriesToContainer)
row.append(addr.deliveriesFromContainer)
- row.append(addr.priority)
rows.append(row)
title = "Router Addresses"
sorter = Sorter(heads, rows, 'addr', 0, True)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org