[GitHub] activemq-artemis pull request #1207: Many fixes around some tests I'm doing

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] activemq-artemis pull request #1207: Many fixes around some tests I'm doing

michaelandrepearce-2
GitHub user clebertsuconic opened a pull request:

    https://github.com/apache/activemq-artemis/pull/1207

    Many fixes around some tests I'm doing

    These are all related to some work I'm doing...

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/clebertsuconic/activemq-artemis journal

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/activemq-artemis/pull/1207.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1207
   
----
commit 23d15730369a399d3d53181d10478c4de955e8a3
Author: Francesco Nigro <[hidden email]>
Date:   2017-04-13T15:48:00Z

    ARTEMIS-1117 Improving IO Failure resilience Part I
   
    Me (Clebert) and Francesco worked independently here.
    I am keeping Francesco's changes on a separate commit
   
    https://issues.apache.org/jira/browse/ARTEMIS-1117

commit fbb97529902134b58561f767c0da03c95291e682
Author: Clebert Suconic <[hidden email]>
Date:   2017-04-13T13:04:34Z

    ARTEMIS-1117 Improving IO Resilience Part II
   
    https://issues.apache.org/jira/browse/ARTEMIS-1117

commit 3898caaa07b9dd0a152b9d8a86a277bbc302eaee
Author: Clebert Suconic <[hidden email]>
Date:   2017-04-17T20:04:31Z

    ARTEMIS-1120 doubling memory estimate
   
    https://issues.apache.org/jira/browse/ARTEMIS-1120

commit 9cb67b5bf64ffc78e5e29204e99e9a8e8748bead
Author: Clebert Suconic <[hidden email]>
Date:   2017-04-17T19:02:33Z

    ARTEMIS-1119 flow controlling connection
   
    https://issues.apache.org/jira/browse/ARTEMIS-1119

commit baec729bee35046527a5be7bb52e6256052bbadf
Author: Clebert Suconic <[hidden email]>
Date:   2017-04-18T00:02:02Z

    ARTEMIS-1121 Improving expiry scanner
   
    https://issues.apache.org/jira/browse/ARTEMIS-1121

commit 680b6d963f5222b3056e5347a2e2664141840919
Author: Clebert Suconic <[hidden email]>
Date:   2017-04-18T03:21:43Z

    ARTEMIS-1118 IO callbacks on AMQP

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|

[GitHub] activemq-artemis pull request #1207: Many fixes around some tests I'm doing

michaelandrepearce-2
Github user clebertsuconic commented on a diff in the pull request:

    https://github.com/apache/activemq-artemis/pull/1207#discussion_r111867332
 
    --- Diff: artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java ---
    @@ -380,22 +403,26 @@ public void serverSend(final Transaction transaction,
              }
           }
     
    -      recoverContext();
    +      OperationContext oldcontext = recoverContext();
     
    -      PagingStore store = manager.getServer().getPagingManager().getPageStore(message.getAddressSimpleString());
    -      if (store.isRejectingMessages()) {
    -         // We drop pre-settled messages (and abort any associated Tx)
    -         if (delivery.remotelySettled()) {
    -            if (transaction != null) {
    -               String amqpAddress = delivery.getLink().getTarget().getAddress();
    -               ActiveMQException e = new ActiveMQAMQPResourceLimitExceededException("Address is full: " + amqpAddress);
    -               transaction.markAsRollbackOnly(e);
    +      try {
    +         PagingStore store = manager.getServer().getPagingManager().getPageStore(message.getAddressSimpleString());
    +         if (store.isRejectingMessages()) {
    +            // We drop pre-settled messages (and abort any associated Tx)
    +            if (delivery.remotelySettled()) {
    +               if (transaction != null) {
    +                  String amqpAddress = delivery.getLink().getTarget().getAddress();
    +                  ActiveMQException e = new ActiveMQAMQPResourceLimitExceededException("Address is full: " + amqpAddress);
    +                  transaction.markAsRollbackOnly(e);
    +               }
    +            } else {
    +               rejectMessage(delivery, AmqpError.RESOURCE_LIMIT_EXCEEDED, "Address is full: " + address);
                 }
              } else {
    -            rejectMessage(delivery, AmqpError.RESOURCE_LIMIT_EXCEEDED, "Address is full: " + address);
    +            serverSend(transaction, message, delivery, receiver);
    --- End diff --
   
    what the?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|

[GitHub] activemq-artemis pull request #1207: Many fixes around some tests I'm doing

michaelandrepearce-2
In reply to this post by michaelandrepearce-2
Github user clebertsuconic commented on a diff in the pull request:

    https://github.com/apache/activemq-artemis/pull/1207#discussion_r112008696
 
    --- Diff: artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java ---
    @@ -134,6 +139,24 @@ public void run() {
           }
        }
     
    +   public void withinContext(RunnableEx run) throws Exception {
    --- End diff --
   
    @jbertram RunnableEx is being used here through Lambdas...
    (you asked me about that privately)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|

[GitHub] activemq-artemis pull request #1207: Many fixes around some tests I'm doing

michaelandrepearce-2
In reply to this post by michaelandrepearce-2
Github user asfgit closed the pull request at:

    https://github.com/apache/activemq-artemis/pull/1207


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---