[qpid-dispatch] branch main updated: NO-JIRA: Skip the GHA Docs job until Proton 0.34.0 Ubuntu package is published (#1169)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new d2f47a1 NO-JIRA: Skip the GHA Docs job until Proton 0.34.0 Ubuntu
package is published (#1169)
d2f47a1 is described below
commit d2f47a19077e604bce22513955dc9466192ca4ca
Author: Jiri Daněk
AuthorDate: Wed Apr 28 11:10:54 2021 +0200
NO-JIRA: Skip the GHA Docs job until Proton 0.34.0 Ubuntu package is
published (#1169)
---
.github/workflows/build.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2fe1b6e..ac87e53 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -239,6 +239,7 @@ jobs:
docs:
name: 'Docs (${{ matrix.os }})'
runs-on: ${{ matrix.os }}
+if: ${{ false }} # disabled until Proton 0.34.0 Ubuntu package is
published
strategy:
matrix:
os: [ ubuntu-20.04 ]
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] 02/02: make module name element capitalisations consistent
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git commit 961ea785f9fb078c31d0bb44d7d5bc700a812ce5 Author: Robbie Gemmell AuthorDate: Wed Apr 28 14:30:49 2021 +0100 make module name element capitalisations consistent --- protonj2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protonj2/pom.xml b/protonj2/pom.xml index 45e5af3..ecceb46 100644 --- a/protonj2/pom.xml +++ b/protonj2/pom.xml @@ -24,7 +24,7 @@ 4.0.0 protonj2 - Qpid ProtonJ2 AMQP protocol library + Qpid ProtonJ2 AMQP Protocol Library AMQP 1.0 protocol engine and codec library bundle - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] 01/02: gate off the JMH perf tests module from main build, require it be enabled or built directly
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
commit 1fedf3dde025a10515634b11822e40b8bd3f7f75
Author: Robbie Gemmell
AuthorDate: Wed Apr 28 14:29:37 2021 +0100
gate off the JMH perf tests module from main build, require it be enabled
or built directly
---
pom.xml | 16 ++-
protonj2-performance-tests/README.md | 2 --
protonj2-performance-tests/pom.xml | 38 +++-
3 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6256c8..e2499e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,6 @@
protonj2
-protonj2-performance-tests
protonj2-test-driver
protonj2-client
protonj2-client-examples
@@ -333,6 +332,8 @@
true
@{project.version}
+-Papache-release -Dperform-release-checks=true
${arguments}
+true
@@ -374,6 +375,19 @@
+
+
+protonj2-performance-tests
+
+
+
+
+ performance-jmh
+
+protonj2-performance-tests
+
diff --git a/protonj2-performance-tests/README.md
b/protonj2-performance-tests/README.md
index bbb122a..a0d2c97 100644
--- a/protonj2-performance-tests/README.md
+++ b/protonj2-performance-tests/README.md
@@ -10,8 +10,6 @@ within the overall build by using the 'performance-jmh' maven
profile.
Building the benchmarks
---
-TODO - Currently just part of the build with deploy disabled.
-
The benchmarks are maven built and involve some code generation for the JMH
part. As such it is required that you
rebuild upon changing the code. As the codebase is small it is recommended
that you do this from the project
root folder to avoid missing any changes from other modules.
diff --git a/protonj2-performance-tests/pom.xml
b/protonj2-performance-tests/pom.xml
index 0a12d70..f704c2c 100644
--- a/protonj2-performance-tests/pom.xml
+++ b/protonj2-performance-tests/pom.xml
@@ -24,7 +24,7 @@
protonj2-performance-tests
- Qpid ProtonJ2 JMH performance tests
+ Qpid ProtonJ2 JMH Performance Tests
JMH Tests for the ProtonJ2 library
jar
@@ -85,4 +85,40 @@
+
+
+ perform-release-checks
+
+
+ perform-release-checks
+ true
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+enforce-release-version
+
+enforce
+
+
+
+
+ Module still has a SNAPSHOT version! Ensure
release is prepared using "mvn release:prepare -Papache-release"
+
+
+
+ true
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated (241c842 -> 961ea78)
This is an automated email from the ASF dual-hosted git repository. robbie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git. from 241c842 Add additional waits for the intermediate peer to complete new 1fedf3d gate off the JMH perf tests module from main build, require it be enabled or built directly new 961ea78 make module name element capitalisations consistent 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: pom.xml | 16 ++- protonj2-performance-tests/README.md | 2 -- protonj2-performance-tests/pom.xml | 38 +++- protonj2/pom.xml | 2 +- 4 files changed, 53 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated: DISPATCH-2090: [tools] Scraper handles non-terminal dispositions
This is an automated email from the ASF dual-hosted git repository.
chug pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new 04c1001 DISPATCH-2090: [tools] Scraper handles non-terminal
dispositions
04c1001 is described below
commit 04c10019bd69427ef70566087ec2f1bb945ffc86
Author: Chuck Rolke
AuthorDate: Wed Apr 28 10:18:49 2021 -0400
DISPATCH-2090: [tools] Scraper handles non-terminal dispositions
Non-terminal dispositions were added to effect TCP adaptor flow control
in the 1.16 release. Scraper needs adjustments to handle them.
* Report negative disposition delta times as 0 seconds
* Allow non-terminal dispositions to be overwritten without logging an
error
---
tools/scraper/amqp_detail.py | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/tools/scraper/amqp_detail.py b/tools/scraper/amqp_detail.py
index 8a2de9b..0b2c3cd 100755
--- a/tools/scraper/amqp_detail.py
+++ b/tools/scraper/amqp_detail.py
@@ -449,6 +449,9 @@ class AllDetails():
:param t0:
:return:
"""
+if ttest < t0:
+# Never return negative deltas
+return "0.00"
delta = ttest - t0
t = float(delta.seconds) + float(delta.microseconds) / 100.0
return "%0.06f" % t
@@ -681,8 +684,18 @@ class AllDetails():
for sdid in range(int(splf.data.first),
(int(splf.data.last) + 1)):
did = str(sdid)
if did in sdispmap:
-sys.stderr.write("ERROR: Delivery ID collision
in disposition map. connid:%s, \n" %
- (splf.data.conn_id))
+old_splf = sdispmap[did]
+if "state=@received" in old_splf.line:
+# Existing disposition is non-terminal.
+# Don't complain when it is overwritten by
another non-terminal
+# or by a terminal disposition.
+pass
+else:
+# Current state is terminal disposition.
Complain when overwritten.
+sys.stderr.write("ERROR: Delivery ID
collision in disposition map. connid:%s, \n" %
+ (splf.data.conn_id))
+sys.stderr.write(" old: %s, %s\n" %
(old_splf.fid, old_splf.line))
+sys.stderr.write(" new: %s, %s\n" %
(splf.fid, splf.line))
sdispmap[did] = splf
def rollup_disposition_counts(self, state, conn, sess, link):
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated: Fix intermittent test failure in CI
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new 71957cc Fix intermittent test failure in CI
71957cc is described below
commit 71957ccd97203c787eac6e9a3748493996d43851
Author: Timothy Bish
AuthorDate: Wed Apr 28 11:32:57 2021 -0400
Fix intermittent test failure in CI
---
.../apache/qpid/protonj2/client/impl/StreamSenderTest.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
index 7125a28..9a12b51 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
@@ -2350,7 +2350,7 @@ public class StreamSenderTest extends
ImperativeClientTestCase {
peer.expectOpen().respond();
peer.expectBegin().respond();
peer.expectAttach().ofSender().respond();
-
peer.remoteFlow().withIncomingWindow(WRITE_COUNT).withNextIncomingId(1).withLinkCredit(WRITE_COUNT).queue();
+
peer.remoteFlow().withIncomingWindow(WRITE_COUNT).withNextIncomingId(0).withLinkCredit(WRITE_COUNT).queue();
peer.start();
URI remoteURI = peer.getServerURI();
@@ -2388,15 +2388,17 @@ public class StreamSenderTest extends
ImperativeClientTestCase {
peer.waitForScriptToComplete(5, TimeUnit.SECONDS);
peer.expectTransfer().withNullPayload().withMore(false).accept();
-peer.expectDetach().respond();
-peer.expectEnd().respond();
-peer.expectClose().respond();
// grant one more credit for the complete to arrive.
-
peer.remoteFlow().withIncomingWindow(1).withNextIncomingId(WRITE_COUNT +
1).withLinkCredit(1).now();
+
peer.remoteFlow().withIncomingWindow(1).withNextIncomingId(WRITE_COUNT).withLinkCredit(1).later(10);
stream.close();
+peer.waitForScriptToComplete(5, TimeUnit.SECONDS);
+peer.expectDetach().respond();
+peer.expectEnd().respond();
+peer.expectClose().respond();
+
sender.closeAsync().get();
connection.closeAsync().get();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-interop-test] branch main updated: Final fix for new Rhea - AMQP timestamp type converting from Date objects back to unix timestamps
This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/main by this push:
new c638a8b Final fix for new Rhea - AMQP timestamp type converting from
Date objects back to unix timestamps
c638a8b is described below
commit c638a8b786d9fbe808cc19720ddf0367fb48f9bd
Author: Kim van der Riet
AuthorDate: Wed Apr 28 11:51:22 2021 -0400
Final fix for new Rhea - AMQP timestamp type converting from Date objects
back to unix timestamps
---
shims/rhea-js/amqp_types_test/Receiver.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shims/rhea-js/amqp_types_test/Receiver.js
b/shims/rhea-js/amqp_types_test/Receiver.js
index 5b9b51e..8b2c663 100755
--- a/shims/rhea-js/amqp_types_test/Receiver.js
+++ b/shims/rhea-js/amqp_types_test/Receiver.js
@@ -92,7 +92,7 @@ function Receiver(brokerAddr, brokerPort, queueName,
amqpType, numTestValues) {
};
this.decodeTimestamp = function(msgBody) {
-return "0x" + msgBody.getTime().toString('hex');
+return "0x" + msgBody.getTime().toString(16);
}
this.decodeSigned = function(msgBody) {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated: Add missing test expectation which fixes some intermittent CI failures
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new 4f40d07 Add missing test expectation which fixes some intermittent CI
failures
4f40d07 is described below
commit 4f40d075ca0109d8c4795147557835ebc2f844e3
Author: Timothy Bish
AuthorDate: Wed Apr 28 11:57:47 2021 -0400
Add missing test expectation which fixes some intermittent CI failures
---
.../java/org/apache/qpid/protonj2/client/impl/ReconnectSenderTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReconnectSenderTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReconnectSenderTest.java
index 8b6f9a3..3aa88a8 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReconnectSenderTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReconnectSenderTest.java
@@ -312,6 +312,7 @@ class ReconnectSenderTest extends ImperativeClientTestCase {
intermediatePeer.expectOpen().respond();
intermediatePeer.expectBegin().respond();
intermediatePeer.expectAttach().ofSender();
+intermediatePeer.expectAttach().ofSender();
intermediatePeer.dropAfterLastHandler();
intermediatePeer.start();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated: Add more Javadocs to engine and client API classes
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new 1e75712 Add more Javadocs to engine and client API classes
1e75712 is described below
commit 1e757123ae2c87383df71a177e4b122ff1a0f622
Author: Timothy Bish
AuthorDate: Wed Apr 28 14:28:30 2021 -0400
Add more Javadocs to engine and client API classes
---
.../qpid/protonj2/client/ReconnectLocation.java| 8 ++
.../qpid/protonj2/client/SessionOptions.java | 9 +-
.../apache/qpid/protonj2/client/SourceOptions.java | 3 +
.../apache/qpid/protonj2/client/SslOptions.java| 31 ++-
.../qpid/protonj2/client/TransportOptions.java | 97 +-
.../protonj2/client/impl/ClientDeliveryState.java | 63 +-
.../client/transport/X509AliasKeyManager.java | 11 +++
.../client/util/ReconnectLocationPool.java | 9 ++
.../qpid/protonj2/engine/IncomingAMQPEnvelope.java | 13 +++
.../org/apache/qpid/protonj2/engine/LinkState.java | 21 -
.../qpid/protonj2/engine/OutgoingAMQPEnvelope.java | 27 ++
.../apache/qpid/protonj2/engine/SessionState.java | 15 +++-
12 files changed, 294 insertions(+), 13 deletions(-)
diff --git
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/ReconnectLocation.java
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/ReconnectLocation.java
index 20b9a74..e876523 100644
---
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/ReconnectLocation.java
+++
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/ReconnectLocation.java
@@ -29,6 +29,14 @@ public class ReconnectLocation {
private final String host;
private final int port;
+ /**
+* Creates a new {@link ReconnectLocation} instance with the fixed host
and port values.
+*
+* @param host
+* The remote host where the connection will be made
+* @param port
+* The port on the remote where the connection attempt will be
made.
+*/
public ReconnectLocation(String host, int port) {
Objects.requireNonNull(host, "Cannot create a reconnect entry
with a null host value");
diff --git
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SessionOptions.java
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SessionOptions.java
index bab793f..e65a131 100644
---
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SessionOptions.java
+++
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SessionOptions.java
@@ -24,11 +24,18 @@ import
org.apache.qpid.protonj2.client.exceptions.ClientOperationTimedOutExcepti
import org.apache.qpid.protonj2.client.exceptions.ClientSendTimedOutException;
/**
- * Options that control the behaviour of the {@link Session} created from them.
+ * Options that control the behavior of the {@link Session} created from them.
*/
public class SessionOptions {
+ /**
+* The default Session configured incoming capacity limit to provide to
the remote
+*/
public static final int DEFAULT_SESSION_INCOMING_CAPACITY = 100 * 1024 *
1024;
+
+/**
+ * The default Session configured outgoing capacity to apply to local
pending writes.
+ */
public static final int DEFAULT_SESSION_OUTGOING_CAPACITY = 100 * 1024 *
1024;
private long sendTimeout = ConnectionOptions.DEFAULT_SEND_TIMEOUT;
diff --git
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SourceOptions.java
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SourceOptions.java
index e96a337..c9005c2 100644
---
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SourceOptions.java
+++
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SourceOptions.java
@@ -31,6 +31,9 @@ public final class SourceOptions extends
TerminusOptions {
DeliveryState.Type.ACCEPTED, DeliveryState.Type.REJECTED,
DeliveryState.Type.RELEASED, DeliveryState.Type.MODIFIED
};
+/**
+ * The default AMQP Outcome that will be specified for all new {@link
Receiver} instances.
+ */
public static final ClientDeliveryState DEFAULT_RECEIVER_OUTCOME = new
ClientDeliveryState.ClientModified(true, false);
private DistributionMode distributionMode;
diff --git
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SslOptions.java
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SslOptions.java
index dedef84..144f870 100644
---
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SslOptions.java
+++
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/SslOptions.java
@@ -358,24 +358,47 @@ public class SslOptions implements Cloneable {
return this;
}
+/**
+ * @return
[qpid-dispatch] branch main updated: NO-JIRA: extend test timeout for s390x platform
This is an automated email from the ASF dual-hosted git repository. kgiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/main by this push: new ecdc49b NO-JIRA: extend test timeout for s390x platform ecdc49b is described below commit ecdc49b6452df955bf77e0e1b18f48f2e71810d4 Author: Kenneth Giusti AuthorDate: Wed Apr 28 10:00:45 2021 -0400 NO-JIRA: extend test timeout for s390x platform This closes #1171 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7f63f28..5a476e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,7 @@ jobs: - python3 -m pip install --user protobuf - sudo apt install python3-grpcio env: + - QPID_SYSTEM_TEST_TIMEOUT=300 - PROTON_VERSION=main BUILD_TYPE=RelWithDebInfo - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG -DQD_ENABLE_ASSERTIONS=ON -DDISPATCH_TEST_TIMEOUT=500' - name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on focal)" - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated: DISPATCH-2082: Added qd_delivery_state_t to leaking_types arrary. This closes #1175.
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new 84186ce DISPATCH-2082: Added qd_delivery_state_t to leaking_types
arrary. This closes #1175.
84186ce is described below
commit 84186ce0084f044a1e43689c4c0b648838305dbc
Author: Ganesh Murthy
AuthorDate: Wed Apr 28 16:30:33 2021 -0400
DISPATCH-2082: Added qd_delivery_state_t to leaking_types arrary. This
closes #1175.
---
src/alloc_pool.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/alloc_pool.c b/src/alloc_pool.c
index e4f85e4..1d87097 100644
--- a/src/alloc_pool.c
+++ b/src/alloc_pool.c
@@ -99,6 +99,7 @@ static const char *leaking_types[] = {
"qd_message_t",
"qd_message_content_t",
"qdr_delivery_t",
+"qd_delivery_state_t", // DISPATCH-2082: See comments in JIRA
"qd_link_ref_t",
// system_tests_priority (centos7)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
