[qpid-proton] branch master updated: PROTON-2304: fix epoll proactor hang removing and replacing same canceled timer at front of timers list repeatedly
This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 9722a7f PROTON-2304: fix epoll proactor hang removing and replacing
same canceled timer at front of timers list repeatedly
9722a7f is described below
commit 9722a7f9d3afadffe1883305aff64bfaf977f596
Author: Cliff Jansen
AuthorDate: Mon Nov 16 22:06:07 2020 -0800
PROTON-2304: fix epoll proactor hang removing and replacing same canceled
timer at front of timers list repeatedly
---
c/src/proactor/epoll_timer.c | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/c/src/proactor/epoll_timer.c b/c/src/proactor/epoll_timer.c
index 6c7c3db..6d288e1 100644
--- a/c/src/proactor/epoll_timer.c
+++ b/c/src/proactor/epoll_timer.c
@@ -326,17 +326,19 @@ pn_event_batch_t
*pni_timer_manager_process(pni_timer_manager_t *tm, bool timeou
lock(>context.mutex);
} else {
uint64_t deadline = td->timer->deadline;
- if (deadline && deadline <= now) {
-td->timer->deadline = 0;
-pconnection_t *pc = td->timer->connection;
-lock(>deletion_mutex); // Prevent connection from deleting
itself when tm->context.mutex dropped.
-unlock(>context.mutex);
-pni_pconnection_timeout(pc);
-unlock(>deletion_mutex);
-lock(>context.mutex);
- } else {
-td->list_deadline = td->timer->deadline;
-pn_list_minpush(tm->timers_heap, td);
+ if (deadline) {
+if (deadline <= now) {
+ td->timer->deadline = 0;
+ pconnection_t *pc = td->timer->connection;
+ lock(>deletion_mutex); // Prevent connection from deleting
itself when tm->context.mutex dropped.
+ unlock(>context.mutex);
+ pni_pconnection_timeout(pc);
+ unlock(>deletion_mutex);
+ lock(>context.mutex);
+} else {
+ td->list_deadline = deadline;
+ pn_list_minpush(tm->timers_heap, td);
+}
}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch master updated: DISPATCH-1834: Fixed python-checker errors. Used assertIn and assertNotIn. This closes #912.
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new e44cb6f DISPATCH-1834: Fixed python-checker errors. Used assertIn and
assertNotIn. This closes #912.
e44cb6f is described below
commit e44cb6f5e7509c5a67320b57dffdae51d450b00c
Author: Ganesh Murthy
AuthorDate: Thu Nov 12 16:25:10 2020 -0500
DISPATCH-1834: Fixed python-checker errors. Used assertIn and assertNotIn.
This closes #912.
---
tests/router_policy_test.py| 14 ++---
tests/system_tests_address_lookup.py | 6 +-
tests/system_tests_default_distribution.py | 12 ++--
tests/system_tests_edge_router.py | 38 ++--
tests/system_tests_exchange_bindings.py| 2 +-
tests/system_tests_link_routes.py | 18 +++---
tests/system_tests_management.py | 8 +--
tests/system_tests_multi_tenancy.py| 3 +-
tests/system_tests_open_properties.py | 2 +-
tests/system_tests_policy.py | 4 +-
tests/system_tests_protocol_settings.py| 40 ++---
tests/system_tests_qdmanage.py | 4 +-
tests/system_tests_qdstat.py | 96 +++---
tests/system_tests_router_mesh.py | 2 +-
tests/system_tests_sasl_plain.py | 4 +-
tests/system_tests_ssl.py | 3 +-
tests/system_tests_two_routers.py | 4 +-
17 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/tests/router_policy_test.py b/tests/router_policy_test.py
index f39db54..3ed78d4 100644
--- a/tests/router_policy_test.py
+++ b/tests/router_policy_test.py
@@ -254,7 +254,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:1', 'chuck',
'10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck',
'10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
-self.assertTrue('application connection limit' in diags[0])
+self.assertIn('application connection limit', diags[0])
def test_policy_app_conn_mgr_fail_by_user(self):
stats = PolicyAppConnectionMgr(3, 1, 2)
@@ -262,7 +262,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:1', 'chuck',
'10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck',
'10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
-self.assertTrue('per user' in diags[0])
+self.assertIn('per user', diags[0])
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck',
'10.10.10.10', diags, 2, None))
self.assertFalse(stats.can_connect('10.10.10.10:10003', 'chuck',
'10.10.10.10', diags, 2, None))
@@ -273,7 +273,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:1', 'chuck',
'10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck',
'10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
-self.assertTrue('per host' in diags[0])
+self.assertIn('per host', diags[0])
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck',
'10.10.10.10', diags, None, 2))
self.assertFalse(stats.can_connect('10.10.10.10:10003', 'chuck',
'10.10.10.10', diags, None, 2))
@@ -284,8 +284,8 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:1', 'chuck',
'10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck',
'10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 2)
-self.assertTrue('per user' in diags[0] or 'per user' in diags[1])
-self.assertTrue('per host' in diags[0] or 'per host' in diags[1])
+success = 'per user' in diags[0] or 'per user' in diags[1]
+self.assertTrue(success)
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck',
'10.10.10.10', diags, 2, 2))
self.assertFalse(stats.can_connect('10.10.10.10:10003', 'chuck',
'10.10.10.10', diags, 2, 2))
@@ -296,7 +296,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:1', 'chuck',
'10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck',
'10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
-self.assertTrue('per user' in diags[0])
+self.assertIn('per user', diags[0])
diags = []
stats.update(3, 2, 2)
self.assertTrue(stats.can_connect('10.10.10.10:10001', 'chuck',
[qpid-proton] annotated tag 0.33.0-rc2 created (now cb9dd45)
This is an automated email from the ASF dual-hosted git repository. robbie pushed a change to annotated tag 0.33.0-rc2 in repository https://gitbox.apache.org/repos/asf/qpid-proton.git. at cb9dd45 (tag) tagging a94815e0e812d75e0b47561ed918a1edc5289691 (commit) replaces 0.33.0-rc1 by Robbie Gemmell on Mon Nov 16 13:14:12 2020 + - Log - tag 0.33.0-rc2 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r44521 - /dev/qpid/proton/0.33.0-rc1/
Author: robbie Date: Mon Nov 16 15:02:24 2020 New Revision: 44521 Log: clean out old RC Removed: dev/qpid/proton/0.33.0-rc1/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r44520 - in /dev/qpid/proton/0.33.0-rc2: ./ qpid-proton-0.33.0.tar.gz qpid-proton-0.33.0.tar.gz.asc qpid-proton-0.33.0.tar.gz.sha512
Author: robbie Date: Mon Nov 16 15:01:33 2020 New Revision: 44520 Log: add files for qpid-proton-0.33.0 (RC2) Added: dev/qpid/proton/0.33.0-rc2/ dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz (with props) dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.asc (with props) dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.sha512 Added: dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz == Binary file - no diff available. Propchange: dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.sha512 == --- dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.sha512 (added) +++ dev/qpid/proton/0.33.0-rc2/qpid-proton-0.33.0.tar.gz.sha512 Mon Nov 16 15:01:33 2020 @@ -0,0 +1 @@ +3a1a50ec970f8fc24303fa98ee7d34b19461fc9a1f8e826000e81ce2a92449b3fa2522da4d54000f90626db93fb0d32d2d4b67783a8c43cebf3d7baed1d1bf2c qpid-proton-0.33.0.tar.gz - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] 02/02: PROTON-2300, PROTON-2269: bump version to 0.34.0-SNAPSHOT again
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git commit 3d3d17450ad9ce3e48e3fa27802971867cecf5b0 Author: Robbie Gemmell AuthorDate: Mon Nov 16 14:58:39 2020 + PROTON-2300, PROTON-2269: bump version to 0.34.0-SNAPSHOT again --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index be386c9..556fb9c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.33.0 +0.34.0-SNAPSHOT - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] 01/02: update version for 0.33.0-rc2
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git commit a94815e0e812d75e0b47561ed918a1edc5289691 Author: Robbie Gemmell AuthorDate: Mon Nov 16 13:11:19 2020 + update version for 0.33.0-rc2 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 556fb9c..be386c9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.34.0-SNAPSHOT +0.33.0 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated (76aafe6 -> 3d3d174)
This is an automated email from the ASF dual-hosted git repository. robbie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git. from 76aafe6 PROTON-2301: Further fix to raw connection wake crashes new a94815e update version for 0.33.0-rc2 new 3d3d174 PROTON-2300, PROTON-2269: bump version to 0.34.0-SNAPSHOT again The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
