Skip to content

Commit

Permalink
Add integration tests for package management service (apache#8876)
Browse files Browse the repository at this point in the history
---

Master Issue: apache#8676

*Motivation*

Add integration tests for testing the whole package management service.

*Modifications*

- Add integration tests
- Fix some issue when startup the package management service
  • Loading branch information
zymap committed Dec 10, 2020
1 parent a95369d commit 8ded6de
Show file tree
Hide file tree
Showing 10 changed files with 165 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ private void startPackagesManagementService() throws IOException {
.newProvider(config.getPackagesManagementStorageProvider());
DefaultPackagesStorageConfiguration storageConfiguration = new DefaultPackagesStorageConfiguration();
storageConfiguration.setProperty(config.getProperties());
PackagesStorage storage = storageProvider.getStorage(new DefaultPackagesStorageConfiguration());
PackagesStorage storage = storageProvider.getStorage(storageConfiguration);
storage.initialize();
packagesManagement.initialize(storage);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CmdPackages extends CmdBase {

private final Packages packages;

CmdPackages(PulsarAdmin admin) {
public CmdPackages(PulsarAdmin admin) {
super("packages", admin);
this.packages = admin.packages();

Expand Down Expand Up @@ -133,7 +133,7 @@ private class ListPackageVersionsCmd extends CliCommand {

@Override
void run() throws Exception {
print(packages.listPackageVersions(packageName).toString());
print(packages.listPackageVersions(packageName));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public class PulsarAdminTool {
// TODO eventually remove this
commandMap.put("source", CmdSources.class);
commandMap.put("sink", CmdSinks.class);

commandMap.put("packages", CmdPackages.class);
}

private void setupCommands(Function<PulsarAdminBuilder, ? extends PulsarAdmin> adminFactory) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public void initialize() {
DistributedLogConfiguration conf = new DistributedLogConfiguration()
.setImmediateFlushEnabled(true)
.setOutputBufferSize(0)
.setWriteQuorumSize(configuration.getNumReplicas())
.setEnsembleSize(configuration.getNumReplicas())
.setAckQuorumSize(configuration.getNumReplicas())
.setWriteQuorumSize(configuration.getPackagesReplicas())
.setEnsembleSize(configuration.getPackagesReplicas())
.setAckQuorumSize(configuration.getPackagesReplicas())
.setLockTimeout(DistributedLogConstants.LOCK_IMMEDIATE);
if (!Strings.isNullOrEmpty(configuration.getBookkeeperClientAuthenticationPlugin())) {
conf.setProperty("bkc.clientAuthProviderFactoryClass",
Expand All @@ -82,9 +82,11 @@ public void initialize() {
}

private URI initializeDlogNamespace() throws IOException {
BKDLConfig bkdlConfig = new BKDLConfig(configuration.getZkServers(), configuration.getLedgersRootPath());
BKDLConfig bkdlConfig = new BKDLConfig(configuration.getZookeeperServers(),
configuration.getPackagesManagementLedgerRootPath());
DLMetadata dlMetadata = DLMetadata.create(bkdlConfig);
URI dlogURI = URI.create(String.format("distributedlog://%s/pulsar/packages", configuration.getZkServers()));
URI dlogURI = URI.create(String.format("distributedlog://%s/pulsar/packages",
configuration.getZookeeperServers()));
try {
dlMetadata.create(dlogURI);
} catch (ZKException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ public class BookKeeperPackagesStorageConfiguration implements PackagesStorageCo
this.configuration = configuration;
}

int getNumReplicas() {
return Integer.parseInt(getProperty("numReplicas"));
int getPackagesReplicas() {
return Integer.parseInt(getProperty("packagesReplicas"));
}

String getZkServers() {
return getProperty("zkServers");
String getZookeeperServers() {
return getProperty("zookeeperServers");
}

String getLedgersRootPath() {
return getProperty("ledgerRootPath");
String getPackagesManagementLedgerRootPath() {
return getProperty("packagesManagementLedgerRootPath");
}

String getBookkeeperClientAuthenticationPlugin() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public void setup() throws Exception {
PackagesStorageProvider provider = PackagesStorageProvider
.newProvider(BookKeeperPackagesStorageProvider.class.getName());
DefaultPackagesStorageConfiguration configuration = new DefaultPackagesStorageConfiguration();
configuration.setProperty("zkServers", zkUtil.getZooKeeperConnectString());
configuration.setProperty("numReplicas", "1");
configuration.setProperty("ledgerRootPath", "/ledgers");
configuration.setProperty("zookeeperServers", zkUtil.getZooKeeperConnectString());
configuration.setProperty("packagesReplicas", "1");
configuration.setProperty("packagesManagementLedgerRootPath", "/ledgers");
storage = provider.getStorage(configuration);
storage.initialize();
}
Expand All @@ -71,9 +71,9 @@ public void teardown() throws Exception {
public void testConfiguration() {
assertTrue(storage instanceof BookKeeperPackagesStorage);
BookKeeperPackagesStorage bkStorage = (BookKeeperPackagesStorage) storage;
assertEquals(bkStorage.configuration.getZkServers(), zkUtil.getZooKeeperConnectString());
assertEquals(bkStorage.configuration.getNumReplicas(), 1);
assertEquals(bkStorage.configuration.getLedgersRootPath(), "/ledgers");
assertEquals(bkStorage.configuration.getZookeeperServers(), zkUtil.getZooKeeperConnectString());
assertEquals(bkStorage.configuration.getPackagesReplicas(), 1);
assertEquals(bkStorage.configuration.getPackagesManagementLedgerRootPath(), "/ledgers");
}

@Test(timeOut = 60000)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/**
* 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.pulsar.tests.integration.cli;

import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.util.HashMap;
import java.util.Map;

public class PackagesCliTest {

private final static String clusterNamePrefix = "packages-service";
private PulsarCluster pulsarCluster;

@BeforeClass
public void setup() throws Exception {
PulsarClusterSpec spec = PulsarClusterSpec.builder()
.clusterName(String.format("%s-%s", clusterNamePrefix, RandomStringUtils.randomAlphabetic(6)))
.brokerEnvs(getPackagesManagementServiceEnvs())
.build();
pulsarCluster = PulsarCluster.forSpec(spec);
pulsarCluster.start();
}

@AfterClass
public void teardown() {
if (pulsarCluster != null) {
pulsarCluster.stop();
pulsarCluster = null;
}
}

private Map<String, String> getPackagesManagementServiceEnvs() {
Map<String, String> envs = new HashMap<>();
envs.put("enablePackagesManagement", "true");
return envs;
}

@Test(timeOut = 60000 * 10)
public void testPackagesOperationsWithoutUploadingPackages() throws Exception {
ContainerExecResult result = runPackagesCommand("list", "--type", "function", "public/default");
assertEquals(result.getExitCode(), 0);
assertTrue(result.getStdout().isEmpty());

result = runPackagesCommand("list-versions", "function://public/default/test");
assertEquals(result.getExitCode(), 0);
assertTrue(result.getStdout().isEmpty());

try {
result = runPackagesCommand("download", "function://public/default/test@v1", "--path", "test-admin");
fail("this command should be failed");
} catch (Exception e) {
// expected exception
}
}

// TODO: the upload command has some problem when uploading packages, enable this tests when issue
// https://github.com/apache/pulsar/issues/8874 is fixed.
public void testPackagesOperationsWithUploadingPackages() throws Exception {
String testPackageName = "function://public/default/test@v1";
ContainerExecResult result = runPackagesCommand("upload", "--description", "a test package",
"--path", PulsarCluster.ADMIN_SCRIPT, testPackageName);
assertEquals(result.getExitCode(), 0);

result = runPackagesCommand("get-metadata", testPackageName);
assertEquals(result.getExitCode(), 0);
assertFalse(result.getStdout().isEmpty());
assertTrue(result.getStdout().contains("a test package"));

result = runPackagesCommand("list", "--type", "function", "public/default");
assertEquals(result.getExitCode(), 0);
assertFalse(result.getStdout().isEmpty());
assertTrue(result.getStdout().contains(testPackageName));

result = runPackagesCommand("list-versions", "--type", "function://public/default/test");
assertEquals(result.getExitCode(), 0);
assertFalse(result.getStdout().isEmpty());
assertTrue(result.getStdout().contains("v1"));

String contact = "test@apache.org";
result = runPackagesCommand("update-metadata", "--contact", contact, "-PpropertyA=A", testPackageName);
assertEquals(result.getExitCode(), 0);

result = runPackagesCommand("get-metadata", testPackageName);
assertEquals(result.getExitCode(), 0);
assertFalse(result.getStdout().isEmpty());
assertTrue(result.getStdout().contains("a test package"));
assertTrue(result.getStdout().contains(contact));
assertTrue(result.getStdout().contains("propertyA"));

result = runPackagesCommand("delete", testPackageName);
assertEquals(result.getExitCode(), 0);

result = runPackagesCommand("list", "--type", "functions", "public/default");
assertEquals(result.getExitCode(), 0);
assertTrue(result.getStdout().isEmpty());
}

private ContainerExecResult runPackagesCommand(String... commands) throws Exception {
String[] cmds = new String[commands.length + 1];
cmds[0] = "packages";
System.arraycopy(commands, 0, cmds, 1, commands.length);
return pulsarCluster.runAdminCommandOnAnyBroker(cmds);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ private PulsarCluster(PulsarClusterSpec spec) {
brokerContainer.withEnv("bookkeeperExplicitLacIntervalInMills", "10");
brokerContainer.withEnv("bookkeeperUseV2WireProtocol", "false");
}
if (spec.brokerEnvs != null) {
brokerContainer.withEnv(spec.brokerEnvs);
}
return brokerContainer;
}
));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,9 @@ public class PulsarClusterSpec {
* Specify envs for proxy.
*/
Map<String, String> proxyEnvs;

/**
* Specify envs for broker.
*/
Map<String, String> brokerEnvs;
}
1 change: 1 addition & 0 deletions tests/integration/src/test/resources/pulsar-cli.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<class name="org.apache.pulsar.tests.integration.compaction.TestCompaction" />
<class name="org.apache.pulsar.tests.integration.cli.AdminMultiHostTest"/>
<class name="org.apache.pulsar.tests.integration.cli.FunctionsCLITest"/>
<class name="org.apache.pulsar.tests.integration.cli.PackagesCliTest"/>
</classes>
</test>
</suite>

0 comments on commit 8ded6de

Please sign in to comment.