Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP][Branch 4.16]ci: fix ci test #4420

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 60 additions & 60 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Large diffs are not rendered by default.

106 changes: 53 additions & 53 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Large diffs are not rendered by default.

120 changes: 60 additions & 60 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.108.Final.jar
- lib/io.netty-netty-codec-4.1.108.Final.jar
- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
- lib/io.netty-netty-common-4.1.108.Final.jar
- lib/io.netty-netty-handler-4.1.108.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
- lib/io.netty-netty-resolver-4.1.108.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
- lib/io.netty-netty-transport-4.1.108.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
- lib/io.netty-netty-buffer-4.1.100.Final.jar
- lib/io.netty-netty-codec-4.1.100.Final.jar
- lib/io.netty-netty-codec-dns-4.1.100.Final.jar
- lib/io.netty-netty-codec-http-4.1.100.Final.jar
- lib/io.netty-netty-codec-http2-4.1.100.Final.jar
- lib/io.netty-netty-codec-socks-4.1.100.Final.jar
- lib/io.netty-netty-common-4.1.100.Final.jar
- lib/io.netty-netty-handler-4.1.100.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.100.Final.jar
- lib/io.netty-netty-resolver-4.1.100.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.100.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
- lib/io.netty-netty-transport-4.1.100.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.100.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.100.Final.jar


The Netty Project
Expand Down
46 changes: 23 additions & 23 deletions bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.108.Final.jar
- lib/io.netty-netty-codec-4.1.108.Final.jar
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
- lib/io.netty-netty-common-4.1.108.Final.jar
- lib/io.netty-netty-handler-4.1.108.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
- lib/io.netty-netty-resolver-4.1.108.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
- lib/io.netty-netty-transport-4.1.108.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
- lib/io.netty-netty-buffer-4.1.100.Final.jar
- lib/io.netty-netty-codec-4.1.100.Final.jar
- lib/io.netty-netty-codec-http-4.1.100.Final.jar
- lib/io.netty-netty-codec-http2-4.1.100.Final.jar
- lib/io.netty-netty-codec-socks-4.1.100.Final.jar
- lib/io.netty-netty-common-4.1.100.Final.jar
- lib/io.netty-netty-handler-4.1.100.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.100.Final.jar
- lib/io.netty-netty-resolver-4.1.100.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
- lib/io.netty-netty-transport-4.1.100.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.100.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.100.Final.jar


The Netty Project
Expand Down
50 changes: 25 additions & 25 deletions bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.108.Final.jar
- lib/io.netty-netty-codec-4.1.108.Final.jar
- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
- lib/io.netty-netty-common-4.1.108.Final.jar
- lib/io.netty-netty-handler-4.1.108.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
- lib/io.netty-netty-resolver-4.1.108.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
- lib/io.netty-netty-transport-4.1.108.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
- lib/io.netty-netty-buffer-4.1.100.Final.jar
- lib/io.netty-netty-codec-4.1.100.Final.jar
- lib/io.netty-netty-codec-dns-4.1.100.Final.jar
- lib/io.netty-netty-codec-http-4.1.100.Final.jar
- lib/io.netty-netty-codec-http2-4.1.100.Final.jar
- lib/io.netty-netty-codec-socks-4.1.100.Final.jar
- lib/io.netty-netty-common-4.1.100.Final.jar
- lib/io.netty-netty-handler-4.1.100.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.100.Final.jar
- lib/io.netty-netty-resolver-4.1.100.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.100.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
- lib/io.netty-netty-transport-4.1.100.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.100.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.23.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.100.Final.jar


The Netty Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
import static org.apache.bookkeeper.client.RegionAwareEnsemblePlacementPolicy.REPP_REGIONS_TO_WRITE;
import static org.apache.bookkeeper.client.RoundRobinDistributionSchedule.writeSetFromValues;
import static org.apache.bookkeeper.feature.SettableFeatureProvider.DISABLE_ALL;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand All @@ -45,7 +49,6 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.feature.FeatureProvider;
Expand All @@ -58,14 +61,18 @@
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.StaticDNSResolver;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Test a region-aware ensemble placement policy.
*/
public class TestRegionAwareEnsemblePlacementPolicy extends TestCase {
public class TestRegionAwareEnsemblePlacementPolicy {

static final Logger LOG = LoggerFactory.getLogger(TestRegionAwareEnsemblePlacementPolicy.class);

Expand All @@ -88,9 +95,8 @@ static void updateMyRack(String rack) throws Exception {
StaticDNSResolver.addNodeToRack("localhost", rack);
}

@Override
@BeforeEach
protected void setUp() throws Exception {
super.setUp();
StaticDNSResolver.reset();
updateMyRack(NetworkTopology.DEFAULT_REGION_AND_RACK);
LOG.info("Set up static DNS Resolver.");
Expand Down Expand Up @@ -122,10 +128,9 @@ protected void setUp() throws Exception {
NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
}

@Override
@AfterEach
protected void tearDown() throws Exception {
repp.uninitalize();
super.tearDown();
}

static BookiesHealthInfo getBookiesHealthInfo() {
Expand Down Expand Up @@ -189,7 +194,7 @@ public void testNodeInSameRegion() throws Exception {
LOG.info("reorder set : {}", reorderSet);
LOG.info("expected set : {}", expectedSet);
LOG.info("reorder equals {}", reorderSet.equals(writeSet));
assertFalse(reorderSet.equals(writeSet));
assertNotEquals(reorderSet, writeSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -233,7 +238,7 @@ public void testNodeDown() throws Exception {
ensemble, getBookiesHealthInfo(), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 1, 2, 0);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -263,7 +268,7 @@ public void testNodeReadOnly() throws Exception {
ensemble, getBookiesHealthInfo(), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 1, 2, 0);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -293,7 +298,7 @@ public void testNodeSlow() throws Exception {
ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 1, 2, 0);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -325,7 +330,7 @@ public void testTwoNodesSlow() throws Exception {
ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 2, 0, 1);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -354,7 +359,7 @@ public void testTwoNodesDown() throws Exception {
ensemble, getBookiesHealthInfo(), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 2, 0, 1);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -385,7 +390,7 @@ public void testNodeDownAndNodeSlow() throws Exception {
ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 2, 0, 1);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -419,7 +424,7 @@ public void testNodeDownAndReadOnlyAndNodeSlow() throws Exception {
ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet);
DistributionSchedule.WriteSet expectedSet = writeSetFromValues(3, 1, 2, 0);
LOG.info("reorder set : {}", reorderSet);
assertFalse(reorderSet.equals(origWriteSet));
assertNotEquals(reorderSet, origWriteSet);
assertEquals(expectedSet, reorderSet);
}

Expand Down Expand Up @@ -471,7 +476,7 @@ public void testReplaceBookieWithEnoughBookiesInDifferentRegion() throws Excepti
BookieId replacedBookie = repp.replaceBookie(1, 1, 1, null,
new ArrayList<BookieId>(), addr2.toBookieId(), excludedAddrs).getResult();

assertFalse(addr1.toBookieId().equals(replacedBookie));
assertNotEquals(addr1.toBookieId(), replacedBookie);
assertTrue(addr3.toBookieId().equals(replacedBookie)
|| addr4.toBookieId().equals(replacedBookie));
}
Expand Down Expand Up @@ -505,6 +510,7 @@ public void testNewEnsembleBookieWithNotEnoughBookies() throws Exception {
}

@Test
@EnabledForJreRange(max = JRE.JAVA_11)
public void testNewEnsembleBookieWithOneEmptyRegion() throws Exception {
BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181);
BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181);
Expand Down Expand Up @@ -1421,17 +1427,17 @@ private void basicReorderReadSequenceWithLocalRegionTest(String myRegion, boolea
.resolve(address).getHostName()));
}
BookieId remoteAddress = ensemble.get(readSet.get(k));
assertFalse(myRegion.equals(StaticDNSResolver.getRegion(repp.bookieAddressResolver
.resolve(remoteAddress).getHostName())));
assertNotEquals(myRegion, StaticDNSResolver.getRegion(repp.bookieAddressResolver
.resolve(remoteAddress).getHostName()));
k++;
BookieId localAddress = ensemble.get(readSet.get(k));
assertEquals(myRegion, StaticDNSResolver.getRegion(repp.bookieAddressResolver
.resolve(localAddress).getHostName()));
k++;
for (; k < ensembleSize; k++) {
BookieId address = ensemble.get(readSet.get(k));
assertFalse(myRegion.equals(StaticDNSResolver.getRegion(repp.bookieAddressResolver
.resolve(address).getHostName())));
assertNotEquals(myRegion, StaticDNSResolver.getRegion(repp.bookieAddressResolver
.resolve(address).getHostName()));
}
}
}
Expand Down Expand Up @@ -1733,12 +1739,12 @@ public void testNewEnsembleSetWithFiveRegions() throws Exception {
List<BookieId> ensemble2 = repp.newEnsemble(3, 3, 2,
null, new HashSet<>()).getResult();
ensemble1.retainAll(ensemble2);
assert(ensemble1.size() >= 1);
assert(!ensemble1.isEmpty());

List<BookieId> ensemble3 = repp.newEnsemble(3, 3, 2,
null, new HashSet<>()).getResult();
ensemble2.removeAll(ensemble3);
assert(ensemble2.size() >= 1);
assert(!ensemble2.isEmpty());
} catch (BKNotEnoughBookiesException bnebe) {
fail("Should not get not enough bookies exception even there is only one rack.");
}
Expand Down
Loading