You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/02/20 19:39:16 UTC
[GitHub] sijie closed pull request #1190: Test that we don't break compat with Yahoo custom version
sijie closed pull request #1190: Test that we don't break compat with Yahoo custom version
URL: https://github.com/apache/bookkeeper/pull/1190
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml
index a136ed234..71ea8ed46 100644
--- a/tests/backward-compat/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -36,5 +36,6 @@
<module>recovery-no-password</module>
<module>old-cookie-new-cluster</module>
<module>current-server-old-clients</module>
+ <module>yahoo-custom-version</module>
</modules>
</project>
diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml
new file mode 100644
index 000000000..ad6c93275
--- /dev/null
+++ b/tests/backward-compat/yahoo-custom-version/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>yahoo-custom-version</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current</name>
+
+</project>
diff --git a/tests/backward-compat/yahoo-custom-version/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeYahooCustom.groovy b/tests/backward-compat/yahoo-custom-version/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeYahooCustom.groovy
new file mode 100644
index 000000000..2a6b91bd6
--- /dev/null
+++ b/tests/backward-compat/yahoo-custom-version/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeYahooCustom.groovy
@@ -0,0 +1,209 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.bookkeeper.tests.backwardcompat
+
+import static java.nio.charset.StandardCharsets.UTF_8
+
+import com.github.dockerjava.api.DockerClient
+
+import java.util.List
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.TimeUnit
+import org.apache.bookkeeper.tests.BookKeeperClusterUtils
+import org.apache.bookkeeper.tests.MavenClassLoader
+
+import org.jboss.arquillian.junit.Arquillian
+import org.jboss.arquillian.test.api.ArquillianResource
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+@RunWith(Arquillian.class)
+class TestCompatUpgradeYahooCustom {
+ private static final Logger LOG = LoggerFactory.getLogger(TestCompatUpgradeYahooCustom.class)
+ private static byte[] PASSWD = "foobar".getBytes()
+
+ def yahooRepo = "https://raw.githubusercontent.com/yahoo/bookkeeper/mvn-repo"
+ def yahooArtifact = "org.apache.bookkeeper:bookkeeper-server:4.3.1.85-yahoo"
+
+ @ArquillianResource
+ DockerClient docker
+
+ int numEntries = 1
+
+ def yahooConfiguredBookKeeper(def classLoader, def zookeeper) {
+ // bookkeeper client configured in same way as pulsar configures it
+ def bkConf = classLoader.newInstance("org.apache.bookkeeper.conf.ClientConfiguration")
+
+ bkConf.setThrottleValue(0)
+ bkConf.setAddEntryTimeout(30)
+ bkConf.setReadEntryTimeout(30)
+ bkConf.setSpeculativeReadTimeout(0)
+ bkConf.setNumChannelsPerBookie(16)
+ bkConf.setUseV2WireProtocol(true)
+ // we can't specify the class name, because it would try to use the thread
+ // context classloader to load, which doesn't have the required classes loaded.
+ bkConf.setLedgerManagerType("hierarchical")
+
+ bkConf.enableBookieHealthCheck()
+ bkConf.setBookieHealthCheckInterval(60, TimeUnit.SECONDS)
+ bkConf.setBookieErrorThresholdPerInterval(5)
+ bkConf.setBookieQuarantineTime(1800, TimeUnit.SECONDS)
+
+ bkConf.setZkServers(zookeeper)
+ return classLoader.newInstance("org.apache.bookkeeper.client.BookKeeper", bkConf)
+ }
+
+ def addEntry(def classLoader, def ledger, def entryData) {
+ def promise = new CompletableFuture<Long>()
+ def buffer = classLoader.callStaticMethod("io.netty.buffer.Unpooled", "copiedBuffer",
+ [entryData.getBytes(UTF_8)])
+ def callback = classLoader.createCallback(
+ "org.apache.bookkeeper.client.AsyncCallback\$AddCallback",
+ { rc, _ledger, entryId, ctx ->
+ if (rc != 0) {
+ promise.completeExceptionally(
+ classLoader.callStaticMethod("org.apache.bookkeeper.client.BKException",
+ "create", [rc]))
+ } else {
+ promise.complete(entryId)
+ }
+ })
+ ledger.asyncAddEntry(buffer, callback, null)
+ return promise
+ }
+
+ def assertCantWrite(def cl, def ledger) throws Exception {
+ try {
+ addEntry(cl, ledger, "Shouldn't write").get()
+ fail("Shouldn't be able to write to ledger")
+ } catch (ExecutionException e) {
+ // correct behaviour
+ // TODO add more
+ }
+ }
+ def createAndWrite(def cl, def bk) throws Exception {
+ def ledger = bk.createLedger(3, 2, cl.digestType("CRC32"), PASSWD)
+ LOG.info("Created ledger ${ledger.getId()}")
+ for (int i = 0; i < numEntries; i++) {
+ addEntry(cl, ledger, "foobar" + i).get()
+ }
+ return ledger
+ }
+
+ def openAndVerifyEntries(def cl, def bk, def ledgerId) throws Exception {
+ LOG.info("Opening ledger $ledgerId")
+ def ledger = bk.openLedger(ledgerId, cl.digestType("CRC32"), PASSWD)
+ def entries = ledger.readEntries(0, ledger.getLastAddConfirmed())
+ int j = 0
+ while (entries.hasMoreElements()) {
+ def e = entries.nextElement()
+ Assert.assertEquals(new String(e.getEntry()), "foobar"+ j)
+ j++
+ }
+ ledger.close()
+ }
+
+ def List<Long> exerciseClients(List<Long> toVerify) {
+ String zookeeper = BookKeeperClusterUtils.zookeeperConnectString(docker)
+ String currentVersion = System.getProperty("currentVersion")
+
+ def ledgers = []
+ def yahooCL = MavenClassLoader.forArtifact(yahooRepo, yahooArtifact)
+ def yahooBK = yahooConfiguredBookKeeper(yahooCL, zookeeper)
+ def currentCL = MavenClassLoader.forBookKeeperVersion(currentVersion)
+ def currentBK = yahooConfiguredBookKeeper(currentCL, zookeeper)
+ try {
+ // verify we can read ledgers from previous run
+ for (Long id : toVerify) {
+ LOG.info("Verifying $id with yahoo client")
+ openAndVerifyEntries(yahooCL, yahooBK, id)
+ LOG.info("Verifying $id with current client")
+ openAndVerifyEntries(currentCL, currentBK, id)
+ }
+ // yahoo client and create open and read
+ def ledger0 = createAndWrite(yahooCL, yahooBK)
+ ledgers.add(ledger0.getId())
+ ledger0.close()
+ openAndVerifyEntries(yahooCL, yahooBK, ledger0.getId())
+
+ // yahoo client can fence on yahoo bookies
+ def ledger1 = createAndWrite(yahooCL, yahooBK)
+ ledgers.add(ledger1.getId())
+ openAndVerifyEntries(yahooCL, yahooBK, ledger1.getId())
+ assertCantWrite(yahooCL, ledger1)
+
+ // current client can create open and read
+ def ledger2 = createAndWrite(currentCL, currentBK)
+ ledgers.add(ledger2.getId())
+ ledger2.close()
+ openAndVerifyEntries(currentCL, currentBK, ledger2.getId())
+
+ // current client can fence on yahoo bookies
+ def ledger3 = createAndWrite(currentCL, currentBK)
+ ledgers.add(ledger3.getId())
+ openAndVerifyEntries(currentCL, currentBK, ledger3.getId())
+ assertCantWrite(currentCL, ledger3)
+
+ // current client can fence a bookie created by yahoo client
+ def ledger4 = createAndWrite(yahooCL, yahooBK)
+ ledgers.add(ledger4.getId())
+ openAndVerifyEntries(currentCL, currentBK, ledger4.getId())
+ assertCantWrite(yahooCL, ledger4)
+
+ // yahoo client can fence a bookie created by current client
+ def ledger5 = createAndWrite(currentCL, currentBK)
+ ledgers.add(ledger5.getId())
+ openAndVerifyEntries(yahooCL, yahooBK, ledger5.getId())
+ assertCantWrite(currentCL, ledger5)
+ } finally {
+ currentBK.close()
+ currentCL.close()
+ yahooBK.close()
+ yahooCL.close()
+ }
+ return ledgers
+ }
+
+ @Test
+ public void testUpgradeYahooCustom() throws Exception {
+ String currentVersion = System.getProperty("currentVersion")
+ String yahooVersion = "4.3-yahoo"
+ BookKeeperClusterUtils.metadataFormatIfNeeded(docker, yahooVersion)
+
+ Assert.assertTrue(BookKeeperClusterUtils.startAllBookiesWithVersion(docker, yahooVersion))
+ def preUpgradeLedgers = exerciseClients([])
+ Assert.assertTrue(BookKeeperClusterUtils.stopAllBookies(docker))
+ BookKeeperClusterUtils.runOnAllBookies(
+ docker, "cp", "/opt/bookkeeper/${yahooVersion}/conf/bookkeeper.conf",
+ "/opt/bookkeeper/${currentVersion}/conf/bk_server.conf")
+ BookKeeperClusterUtils.updateAllBookieConf(docker, currentVersion,
+ "logSizeLimit", "1073741824")
+ BookKeeperClusterUtils.updateAllBookieConf(docker, currentVersion,
+ "statsProviderClass",
+ "org.apache.bookkeeper.stats.NullStatsProvider")
+
+ Assert.assertTrue(BookKeeperClusterUtils.startAllBookiesWithVersion(docker, currentVersion))
+ exerciseClients(preUpgradeLedgers)
+ }
+}
diff --git a/tests/backward-compat/yahoo-custom-version/src/test/resources/arquillian.xml b/tests/backward-compat/yahoo-custom-version/src/test/resources/arquillian.xml
new file mode 100644
index 000000000..f914ff2c2
--- /dev/null
+++ b/tests/backward-compat/yahoo-custom-version/src/test/resources/arquillian.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
+ http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <extension qualifier="docker">
+ <property name="definitionFormat">CUBE</property>
+ <property name="dockerContainersResource">cube-definitions/3-node-all-version-unstarted.yaml</property>
+ </extension>
+
+</arquillian>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services