[
https://issues.apache.org/jira/browse/ARTEMIS-4355?focusedWorklogId=872007&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-872007
]
ASF GitHub Bot logged work on ARTEMIS-4355:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 20/Jul/23 14:31
Start Date: 20/Jul/23 14:31
Worklog Time Spent: 10m
Work Description: gemmellr commented on code in PR #4545:
URL: https://github.com/apache/activemq-artemis/pull/4545#discussion_r1269550857
##########
tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/quorum/ZookeeperPluggableQuorumPeerTest.java:
##########
@@ -48,15 +47,15 @@ public ZookeeperPluggableQuorumPeerTest() {
// both roles as both wish to be primary but will revert to backup
primary = new BrokerControl("primary-peer-a", JMX_PORT_PRIMARY,
"zkReplicationPrimaryPeerA", PRIMARY_PORT_OFFSET);
backup = new BrokerControl("primary-peer-b", JMX_PORT_BACKUP,
"zkReplicationPrimaryPeerB", BACKUP_PORT_OFFSET);
- brokers = new LinkedList(Arrays.asList(primary, backup));
+ brokers = Arrays.asList(primary, backup);
}
@Test
@Override
public void testBackupFailoverAndPrimaryFailback() throws Exception {
// peers don't request fail back by default
// just wait for setup to avoid partial stop of zk via fast tear down
with async setup
- Wait.waitFor(this::ensembleHasLeader);
+
Assert.assertTrue(awaitAsyncSetupCompleted(TimeUnit.SECONDS.toMillis(30L),
TimeUnit.MILLISECONDS));
Review Comment:
Yes, it is related and pretty misleading.
As to the actual behaviour change here..rather than 'waiting for setup to
complete' as it did before, for a test that isnt actually doing anything,
changing things so that the test is skipped and setup doesnt occur would seem
better...then it simply wont need to wait.
Simplest change is perhaps just an Assume check that skips before the setup
occurs. E.g override the @Before setup method and add an Assume check on the
test name, before calling the super method. Maybe something like this
(untested):
Assume.assumeFalse("Test testBackupFailoverAndPrimaryFailback isnt
applicable", "testBackupFailoverAndPrimaryFailback".equals(getName()));
(May also need to update the super @After handling).
Issue Time Tracking
-------------------
Worklog Id: (was: 872007)
Time Spent: 4.5h (was: 4h 20m)
> Update Сurator to 5.5.0; Zookeeper 3.8.2
> ----------------------------------------
>
> Key: ARTEMIS-4355
> URL: https://issues.apache.org/jira/browse/ARTEMIS-4355
> Project: ActiveMQ Artemis
> Issue Type: Dependency upgrade
> Components: clustering
> Affects Versions: 2.29.0
> Reporter: Alexey Markevich
> Priority: Minor
> Time Spent: 4.5h
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
