From commits-return-47673-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Wed Dec 19 22:18:05 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AC744180670 for ; Wed, 19 Dec 2018 22:18:04 +0100 (CET) Received: (qmail 27422 invoked by uid 500); 19 Dec 2018 21:18:03 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 27413 invoked by uid 99); 19 Dec 2018 21:18:03 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2018 21:18:03 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3199280584; Wed, 19 Dec 2018 21:18:03 +0000 (UTC) Date: Wed, 19 Dec 2018 21:18:03 +0000 To: "commits@qpid.apache.org" Subject: [qpid-dispatch] branch 1.5.x updated: DISPATCH-1228 - Made qdstat backward compatible with version 1.3 and 1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154525428312.14642.11802019501281475677@gitbox.apache.org> From: gmurthy@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: qpid-dispatch X-Git-Refname: refs/heads/1.5.x X-Git-Reftype: branch X-Git-Oldrev: dc6045b55b49f83435f25764c926528744b26a5a X-Git-Newrev: e41690f4473ba3505263a0777bb93f9e98779a2c X-Git-Rev: e41690f4473ba3505263a0777bb93f9e98779a2c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gmurthy pushed a commit to branch 1.5.x in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/1.5.x by this push: new e41690f DISPATCH-1228 - Made qdstat backward compatible with version 1.3 and 1.4 e41690f is described below commit e41690f4473ba3505263a0777bb93f9e98779a2c Author: Ganesh Murthy AuthorDate: Wed Dec 19 16:07:55 2018 -0500 DISPATCH-1228 - Made qdstat backward compatible with version 1.3 and 1.4 (cherry picked from commit 65927db66f37687ab6f37e3b5b6dd81178e04c3f) --- tools/qdstat.in | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/qdstat.in b/tools/qdstat.in index 194baf0..7f767c2 100755 --- a/tools/qdstat.in +++ b/tools/qdstat.in @@ -343,11 +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")) - heads.append(Header("presett")) + rows = [] cols = ('linkType', 'linkDir', 'connectionId', 'identity', 'peer', 'owningAddr', @@ -358,12 +354,23 @@ class BusManager(Node): objects = self.query('org.apache.qpid.dispatch.router.link', cols, limit=self.opts.limit) has_dropped_presettled_count = False + has_priority = False if objects: first_row = objects[0] if first_row: if hasattr(first_row, 'droppedPresettledCount'): has_dropped_presettled_count = True + if hasattr(first_row, 'priority'): + has_priority = True + + if has_priority: + heads.append(Header("pri")) + heads.append(Header("undel")) + heads.append(Header("unsett")) + heads.append(Header("del")) + heads.append(Header("presett")) + if has_dropped_presettled_count: heads.append(Header("psdrop")) @@ -388,7 +395,8 @@ 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) + if has_priority: + row.append(link.priority) row.append(link.undeliveredCount) row.append(link.unsettledCount) row.append(link.deliveryCount) @@ -463,7 +471,24 @@ class BusManager(Node): heads.append(Header("addr")) heads.append(Header("phs")) heads.append(Header("distrib")) - heads.append(Header("pri")) + + rows = [] + cols = ('distribution', 'inProcess', 'subscriberCount', 'remoteCount', + 'containerCount', 'deliveriesIngress', 'deliveriesEgress', + 'deliveriesTransit', 'deliveriesToContainer', 'deliveriesFromContainer', 'name', 'priority') + + objects = self.query('org.apache.qpid.dispatch.router.address', cols, limit=self.opts.limit) + + has_priority = False + + if objects: + first_row = objects[0] + if first_row: + if hasattr(first_row, 'priority'): + has_priority = True + + if has_priority: + heads.append(Header("pri")) heads.append(Header("in-proc", Header.COMMAS)) heads.append(Header("local", Header.COMMAS)) heads.append(Header("remote", Header.COMMAS)) @@ -473,12 +498,6 @@ class BusManager(Node): heads.append(Header("thru", Header.COMMAS)) heads.append(Header("to-proc", Header.COMMAS)) heads.append(Header("from-proc", Header.COMMAS)) - rows = [] - cols = ('distribution', 'inProcess', 'subscriberCount', 'remoteCount', - 'containerCount', 'deliveriesIngress', 'deliveriesEgress', - 'deliveriesTransit', 'deliveriesToContainer', 'deliveriesFromContainer', 'name', 'priority') - - objects = self.query('org.apache.qpid.dispatch.router.address', cols, limit=self.opts.limit) for addr in objects: row = [] @@ -486,7 +505,8 @@ 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 "") + if has_priority: + row.append(addr.priority if addr.priority >= 0 else "") row.append(addr.inProcess) row.append(addr.subscriberCount) row.append(addr.remoteCount) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org