Skip to content

DISPATCH-1517: fix delivery count on inbound links #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kgiusti wants to merge 1 commit into from
Closed

DISPATCH-1517: fix delivery count on inbound links #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/router_core/transfer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,6 @@ static void qdr_link_forward_CT(qdr_core_t *core, qdr_link_t *link, qdr_delivery
}

}
link->total_deliveries++;

} else {
//
// There is no address that we can send this delivery to, which means
Expand Down Expand Up @@ -653,6 +651,8 @@ static void qdr_link_deliver_CT(qdr_core_t *core, qdr_action_t *action, bool dis
if (link->conn)
link->conn->last_delivery_time = core->uptime_ticks;

link->total_deliveries++;

//
// Record the ingress time so we can track the age of this delivery.
//
Expand Down Expand Up @@ -692,8 +692,6 @@ static void qdr_link_deliver_CT(qdr_core_t *core, qdr_action_t *action, bool dis

qdr_forward_deliver_CT(core, link->connected_link, peer);

link->total_deliveries++;

if (!dlv->settled) {
DEQ_INSERT_TAIL(link->unsettled, dlv);
dlv->where = QDR_DELIVERY_IN_UNSETTLED;
Expand Down
8 changes: 6 additions & 2 deletions tests/system_tests_delivery_counts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,13 @@ def test_one_router_released_dropped_counts(self):
self.assertEqual(results[deliveries_presettled_index], 10)

# check link statistics
self.assertEqual(test.sender_stats['deliveryCount'], test.n_sent)
self.assertEqual(test.sender_stats['releasedCount'], 10)
self.assertEqual(test.sender_stats['presettledCount'], 10)
self.assertEqual(test.sender_stats['droppedPresettledCount'], 10)
self.assertTrue(_link_stats_are_zero(test.sender_stats,
_LINK_STATISTIC_KEYS - set(['releasedCount',
_LINK_STATISTIC_KEYS - set(['deliveryCount',
'releasedCount',
'presettledCount',
'droppedPresettledCount'])))

Expand Down Expand Up @@ -229,11 +231,13 @@ def test_two_router_released_dropped_counts(self):
self.assertEqual(results[deliveries_presettled_index], 10)

# check link statistics
self.assertEqual(test.sender_stats['deliveryCount'], test.n_sent)
self.assertEqual(test.sender_stats['releasedCount'], 10)
self.assertEqual(test.sender_stats['presettledCount'], 10)
self.assertEqual(test.sender_stats['droppedPresettledCount'], 10)
self.assertTrue(_link_stats_are_zero(test.sender_stats,
_LINK_STATISTIC_KEYS - set(['releasedCount',
_LINK_STATISTIC_KEYS - set(['deliveryCount',
'releasedCount',
'presettledCount',
'droppedPresettledCount'])))

Expand Down