[qpid-dispatch] branch dev-protocol-adaptors-2 updated: DISPATCH-1776: Additional fix. Create nghttp2 client session on creation of new connection
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch dev-protocol-adaptors-2
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/dev-protocol-adaptors-2 by
this push:
new 4e9a098 DISPATCH-1776: Additional fix. Create nghttp2 client session
on creation of new connection
4e9a098 is described below
commit 4e9a0982115e1a56edd3d53b04c47d3b2740b6a8
Author: Ganesh Murthy
AuthorDate: Fri Nov 6 21:26:46 2020 -0500
DISPATCH-1776: Additional fix. Create nghttp2 client session on creation of
new connection
---
src/adaptors/http2/http2_adaptor.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/adaptors/http2/http2_adaptor.c
b/src/adaptors/http2/http2_adaptor.c
index 74a4d9f..4ea5a48 100644
--- a/src/adaptors/http2/http2_adaptor.c
+++ b/src/adaptors/http2/http2_adaptor.c
@@ -2025,8 +2025,6 @@ qdr_http2_connection_t
*qdr_http_connection_egress(qd_http_connector_t *connecto
DEQ_INSERT_TAIL(http2_adaptor->connections, egress_http_conn);
sys_mutex_unlock(http2_adaptor->lock);
-nghttp2_session_client_new(&egress_http_conn->session_data->session,
(nghttp2_session_callbacks*)http2_adaptor->callbacks, (void *)egress_http_conn);
-
qdr_connection_info_t *info = qdr_connection_info(false, //bool
is_encrypted,
false, //bool
is_authenticated,
true, //bool
opened,
@@ -2079,6 +2077,7 @@ static void handle_connection_event(pn_event_t *e,
qd_server_t *qd_server, void
send_settings_frame(conn);
qd_log(log, QD_LOG_INFO, "[C%"PRIu64"] Accepted Ingress
((PN_RAW_CONNECTION_CONNECTED)) from %s", conn->conn_id, conn->remote_address);
} else {
+nghttp2_session_client_new(&conn->session_data->session,
(nghttp2_session_callbacks*)http2_adaptor->callbacks, (void *)conn);
qd_log(log, QD_LOG_INFO, "[C%"PRIu64"] Connected Egress
(PN_RAW_CONNECTION_CONNECTED), thread_id=%i", conn->conn_id, pthread_self());
conn->connection_established = true;
create_stream_dispatcher_link(conn);
@@ -2102,12 +2101,11 @@ static void handle_connection_event(pn_event_t *e,
qd_server_t *qd_server, void
}
else {
qd_log(log, QD_LOG_TRACE, "[C%"PRIu64"] Egress
PN_RAW_CONNECTION_DISCONNECTED", conn->conn_id);
-}
-conn->connection_established = false;
-if (!conn->ingress) {
+conn->client_magic_sent = false;
qd_log(log, QD_LOG_TRACE, "[C%"PRIu64"] Scheduling 2 second timer
to reconnect to egress connection", conn->conn_id);
qd_timer_schedule(conn->activate_timer, 2000);
}
+conn->connection_established = false;
handle_disconnected(conn);
break;
}
-
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-1746: Added some log messages. Created the first_sender when flow is available for self.waypoint_sender
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 3037ee5 DISPATCH-1746: Added some log messages. Created the first_sender when flow is available for self.waypoint_sender 3037ee5 is described below commit 3037ee5ee16865519631b489ba3d9a04e63be007 Author: Ganesh Murthy AuthorDate: Fri Nov 6 16:28:06 2020 -0500 DISPATCH-1746: Added some log messages. Created the first_sender when flow is available for self.waypoint_sender --- tests/system_tests_multi_tenancy.py| 61 +- tests/system_tests_multi_tenancy_policy.py | 57 2 files changed, 101 insertions(+), 17 deletions(-) diff --git a/tests/system_tests_multi_tenancy.py b/tests/system_tests_multi_tenancy.py index 475e04c..7612aa9 100644 --- a/tests/system_tests_multi_tenancy.py +++ b/tests/system_tests_multi_tenancy.py @@ -23,7 +23,7 @@ from __future__ import absolute_import from __future__ import print_function from proton import Message, Timeout -from system_test import TestCase, Qdrouterd, main_module, TIMEOUT, unittest, TestTimeout, PollTimeout +from system_test import TestCase, Qdrouterd, main_module, TIMEOUT, unittest, TestTimeout, PollTimeout, Logger from proton.handlers import MessagingHandler from proton.reactor import Container, DynamicNodeProperties from qpid_dispatch_internal.compat import UNICODE @@ -387,6 +387,9 @@ class RouterTest(TestCase): "0.0.0.0/queue.waypoint", "0.0.0.0/queue.waypoint") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -396,6 +399,9 @@ class RouterTest(TestCase): "queue.waypoint", "0.0.0.0/queue.waypoint") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -405,6 +411,9 @@ class RouterTest(TestCase): "0.0.0.0/queue.waypoint", "0.0.0.0/queue.waypoint") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -414,6 +423,9 @@ class RouterTest(TestCase): "queue.waypoint", "0.0.0.0/queue.waypoint") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -424,6 +436,9 @@ class RouterTest(TestCase): "EXT", "ALCE") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -434,6 +449,9 @@ class RouterTest(TestCase): "EXT", "ALCE") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -444,6 +462,9 @@ class RouterTest(TestCase): "EXT", "ALCE") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -454,6 +475,9 @@ class RouterTest(TestCase): "EXT", "ALCE") test.run() +# Dump the logger output only if there is a test error, otherwise dont bother +if test.error: +test.logger.dump() self.assertEqual(None, test.error) @@ -820,12 +844,16 @@ class WaypointTest(MessagingHandler): self.first_address = first_address self.second_address = second_address self.container_id = container_id +self.logger = Logger(title="WaypointTest") self.first_conn= None self.second_conn = None self.error = None self.first_sender = None +self.first_sender_created = False +self.first_sender_link_opened = False self.first_receiver= None +self.first_receiver_created= False self.waypoint_sender = None self
[qpid-dispatch] branch dev-protocol-adaptors-2 updated: DISPACH-1807: TCP self test integration with scraper
This is an automated email from the ASF dual-hosted git repository.
chug pushed a commit to branch dev-protocol-adaptors-2
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/dev-protocol-adaptors-2 by
this push:
new 61fe9a8 DISPACH-1807: TCP self test integration with scraper
61fe9a8 is described below
commit 61fe9a8773eae07ac2e4914be56a17fbe3d22f51
Author: Chuck Rolke
AuthorDate: Fri Nov 6 08:56:59 2020 -0500
DISPACH-1807: TCP self test integration with scraper
Add hook and instructions for merging TCP adaptor self test log
with router logs in scraper. There is still a manual step that will
be unnecessary in upcoming commits.
---
tests/system_tests_tcp_adaptor.py | 11 +++
1 file changed, 11 insertions(+)
diff --git a/tests/system_tests_tcp_adaptor.py
b/tests/system_tests_tcp_adaptor.py
index 52c945a..d8019ef 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -187,6 +187,17 @@ class TcpAdaptor(TestCase):
print_to_console=True,
save_for_dump=False)
+# Write a dummy log line for scraper.
+# With this the test log can be identified and consumed in scraper.
+# 1. Capture test log output to file 'test.log'.
+# 2. Edit away prefix (e.g. '71: ') so each line starts with time of
day.
+# 3. Edit away ctest lines and fragments that have no time of day.
+# 4. Run scraper:
+# 'scraper -lm TCP_ADAPTOR,TCP_TEST,ECHO_SERVER,ECHO_CLIENT -f
I*.log E*.log test.log > test.html'
+# 5. Profit:
+# 'firefox test.html'
+cls.logger.log("SERVER (info) Container Name: TCP_TEST")
+
# Create a scoreboard for the ports
p_out = []
for rtr in cls.router_order:
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
