ARTEMIS-856 Test fixes - Alternative

[michaelandrepearce]

@clebertsuconic

Here's a slight alternative option to your pr (#2209) i took the fixes for the server and control, but in the queueimpl I wanted to keep away from having the redistributor in the list (reason being later where want to try make the dispatch policies more pluggable it makes it very hard)

Also interestingly applying the same change that Franz has done for CPU here, but for the redistributor fixes many of the redistributor issues, essentially it was failing because it ended up in a spin.
#2203

One case in the messageredistributiontest though still fails (testRedistributionWithMessageGroups), im looking into why it might, but if you can spot please do tell.

If you need master fixed asap, maybe merge your PR, and i can pr this over the top once i figure it out.

[michaelandrepearce]

@clebertsuconic i figured out the last case and fixed it, as normal a one liner, so this should be good now if you'd rather take this one.

[clebertsuconic]

@michaelandrepearce Let me run my internal CI.. if all good will merge it in 2 hours (time to have the whole run)

[franz1981]

@michaelandrepearce @clebertsuconic If it is including the changes of #2203 please consider to add the test I have put there too (if it seems good) 👍

[michaelandrepearce]

@franz1981 i dont think it made it before the merge. Could you pr it by itself and ill merge

[clebertsuconic]

@michaelandrepearce I still have the following tests failing with these changes:

• org.apache.activemq.artemis.tests.integration.cluster.distribution.AMQPMessageLoadBalancingTest.testLoadBalanceAMQP
• org.apache.activemq.artemis.tests.integration.cluster.failover.ReplicatedPagingFailoverTest.testPageFailBeforeConsume
• org.apache.activemq.artemis.tests.integration.openwire.cluster.TemporaryQueueClusterTest.testClusteredQueue
• org.apache.activemq.artemis.tests.integration.server.ScaleDownTest.testBasicScaleDown[useScaleDownGroupName=true]
• org.apache.activemq.artemis.tests.integration.server.ScaleDownTest.testStoreAndForward[useScaleDownGroupName=true]
• org.apache.activemq.artemis.tests.integration.server.ScaleDownTest.testBasicScaleDown[useScaleDownGroupName=false]
• org.apache.activemq.artemis.tests.integration.server.ScaleDownTest.testStoreAndForward[useScaleDownGroupName=false]

These all passed 100% with my other fix. (Not saying my fix was correct.. but there's something still around the routing logic.

I'm taking today's off... I may come back into this tomorrow.. but any help is appreciated.

[michaelandrepearce]

@clebertsuconic have the day off dude, i will look into tomorrow (its now nightime) during the day (UK), im sure i can sort, if any others just list.

[michaelandrepearce]

@clebertsuconic see #2212.

Was a simple one.