Repository: qpid-dispatch Updated Branches: refs/heads/master 7b2d8225e -> 448605e2a
DISPATCH-991 - Added back area attribute and fixed the keyError. Now qdstat will be backward compatible (cherry picked from commit 90b04701f01ea53fb00efc8b5d44c321bb78dc79) Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/448605e2 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/448605e2 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/448605e2 Branch: refs/heads/master Commit: 448605e2a7d4cd724ab5d0659e060b11f4841994 Parents: 7b2d822 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Tue May 8 17:10:00 2018 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Tue May 8 17:33:59 2018 -0400 ---------------------------------------------------------------------- src/router_core/agent_router.c | 45 ++++++++++++++++++++++--------------- src/router_core/agent_router.h | 2 +- tools/qdstat | 28 ++++++++++++++--------- 3 files changed, 45 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/448605e2/src/router_core/agent_router.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_router.c b/src/router_core/agent_router.c index b5690ff..f9303c8 100644 --- a/src/router_core/agent_router.c +++ b/src/router_core/agent_router.c @@ -29,24 +29,25 @@ #define QDR_ROUTER_ID 2 #define QDR_ROUTER_TYPE 3 #define QDR_ROUTER_MODE 4 -#define QDR_ROUTER_VERSION 5 -#define QDR_ROUTER_ADDR_COUNT 6 -#define QDR_ROUTER_LINK_COUNT 7 -#define QDR_ROUTER_NODE_COUNT 8 -#define QDR_ROUTER_LINK_ROUTE_COUNT 9 -#define QDR_ROUTER_AUTO_LINK_COUNT 10 -#define QDR_ROUTER_CONNECTION_COUNT 11 -#define QDR_ROUTER_PRESETTLED_DELIVERIES 12 -#define QDR_ROUTER_DROPPED_PRESETTLED_DELIVERIES 13 -#define QDR_ROUTER_ACCEPTED_DELIVERIES 14 -#define QDR_ROUTER_REJECTED_DELIVERIES 15 -#define QDR_ROUTER_RELEASED_DELIVERIES 16 -#define QDR_ROUTER_MODIFIED_DELIVERIES 17 -#define QDR_ROUTER_DELIVERIES_INGRESS 18 -#define QDR_ROUTER_DELIVERIES_EGRESS 19 -#define QDR_ROUTER_DELIVERIES_TRANSIT 20 -#define QDR_ROUTER_DELIVERIES_INGRESS_ROUTE_CONTAINER 21 -#define QDR_ROUTER_DELIVERIES_EGRESS_ROUTE_CONTAINER 22 +#define QDR_ROUTER_AREA 5 +#define QDR_ROUTER_VERSION 6 +#define QDR_ROUTER_ADDR_COUNT 7 +#define QDR_ROUTER_LINK_COUNT 8 +#define QDR_ROUTER_NODE_COUNT 9 +#define QDR_ROUTER_LINK_ROUTE_COUNT 10 +#define QDR_ROUTER_AUTO_LINK_COUNT 11 +#define QDR_ROUTER_CONNECTION_COUNT 12 +#define QDR_ROUTER_PRESETTLED_DELIVERIES 13 +#define QDR_ROUTER_DROPPED_PRESETTLED_DELIVERIES 14 +#define QDR_ROUTER_ACCEPTED_DELIVERIES 15 +#define QDR_ROUTER_REJECTED_DELIVERIES 16 +#define QDR_ROUTER_RELEASED_DELIVERIES 17 +#define QDR_ROUTER_MODIFIED_DELIVERIES 18 +#define QDR_ROUTER_DELIVERIES_INGRESS 19 +#define QDR_ROUTER_DELIVERIES_EGRESS 20 +#define QDR_ROUTER_DELIVERIES_TRANSIT 21 +#define QDR_ROUTER_DELIVERIES_INGRESS_ROUTE_CONTAINER 22 +#define QDR_ROUTER_DELIVERIES_EGRESS_ROUTE_CONTAINER 23 const char *qdr_router_columns[] = @@ -55,6 +56,7 @@ const char *qdr_router_columns[] = "id", "type", "mode", + "area", "version", "addrCount", "linkCount", @@ -105,6 +107,13 @@ static void qdr_agent_write_column_CT(qd_composed_field_t *body, int col, qdr_co qd_compose_insert_string(body, router_mode(core->router_mode)); break; + case QDR_ROUTER_AREA: + if (core->router_area) + qd_compose_insert_string(body, core->router_area); + else + qd_compose_insert_null(body); + break; + case QDR_ROUTER_VERSION: qd_compose_insert_string(body, QPID_DISPATCH_VERSION); break; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/448605e2/src/router_core/agent_router.h ---------------------------------------------------------------------- diff --git a/src/router_core/agent_router.h b/src/router_core/agent_router.h index b2738f3..dffc0eb 100644 --- a/src/router_core/agent_router.h +++ b/src/router_core/agent_router.h @@ -21,7 +21,7 @@ #include "router_core_private.h" -#define QDR_ROUTER_COLUMN_COUNT 23 +#define QDR_ROUTER_COLUMN_COUNT 24 const char *qdr_router_columns[QDR_ROUTER_COLUMN_COUNT + 1]; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/448605e2/tools/qdstat ---------------------------------------------------------------------- diff --git a/tools/qdstat b/tools/qdstat index f385b85..b980d9d 100755 --- a/tools/qdstat +++ b/tools/qdstat @@ -235,6 +235,7 @@ class BusManager(Node): rows.append(('Version', router.version)) rows.append(('Mode', router.mode)) rows.append(('Router Id', router.id)) + rows.append(('Area', router.area)) rows.append(('Link Routes', router.linkRouteCount)) rows.append(('Auto Links', router.autoLinkCount)) rows.append(('Links', router.linkCount)) @@ -243,17 +244,22 @@ class BusManager(Node): rows.append(('Connections', router.connectionCount)) # Overall delivery related counts. - rows.append(('Presettled Count', router.presettledDeliveries)) - rows.append(('Dropped Presettled Count', router.droppedPresettledDeliveries)) - rows.append(('Accepted Count', router.acceptedDeliveries)) - rows.append(('Rejected Count', router.rejectedDeliveries)) - rows.append(('Released Count', router.releasedDeliveries)) - rows.append(('Modified Count', router.modifiedDeliveries)) - rows.append(('Ingress Count', router.deliveriesIngress)) - rows.append(('Egress Count', router.deliveriesEgress)) - rows.append(('Transit Count', router.deliveriesTransit)) - rows.append(('Deliveries from Route Container', router.deliveriesIngressRouteContainer)) - rows.append(('Deliveries to Route Container', router.deliveriesEgressRouteContainer)) + # These overall statistics were introduced in 1.1 version. + # Wrap these in a try except so that newer versions of qdstat works with older version of router + try: + rows.append(('Presettled Count', router.presettledDeliveries)) + rows.append(('Dropped Presettled Count', router.droppedPresettledDeliveries)) + rows.append(('Accepted Count', router.acceptedDeliveries)) + rows.append(('Rejected Count', router.rejectedDeliveries)) + rows.append(('Released Count', router.releasedDeliveries)) + rows.append(('Modified Count', router.modifiedDeliveries)) + rows.append(('Ingress Count', router.deliveriesIngress)) + rows.append(('Egress Count', router.deliveriesEgress)) + rows.append(('Transit Count', router.deliveriesTransit)) + rows.append(('Deliveries from Route Container', router.deliveriesIngressRouteContainer)) + rows.append(('Deliveries to Route Container', router.deliveriesEgressRouteContainer)) + except: + pass title = "Router Statistics" dispRows = rows --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
