-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Use Accumulo in Docker for unit tests #5598
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 0 additions & 52 deletions
52
presto-accumulo/src/test/java/io/prestosql/plugin/accumulo/MiniAccumuloConfigUtil.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
presto-accumulo/src/test/java/io/prestosql/plugin/accumulo/TestingAccumuloServer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Licensed 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 io.prestosql.plugin.accumulo; | ||
|
|
||
| import org.apache.accumulo.core.client.AccumuloException; | ||
| import org.apache.accumulo.core.client.AccumuloSecurityException; | ||
| import org.apache.accumulo.core.client.Connector; | ||
| import org.apache.accumulo.core.client.ZooKeeperInstance; | ||
| import org.apache.accumulo.core.client.security.tokens.PasswordToken; | ||
| import org.testcontainers.containers.FixedHostPortGenericContainer; | ||
| import org.testcontainers.containers.wait.strategy.Wait; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import static java.lang.String.format; | ||
|
|
||
| public class TestingAccumuloServer | ||
| { | ||
| private static final int ACCUMULO_MASTER_PORT = 9999; | ||
| private static final int ACCUMULO_TSERVER_PORT = 9997; | ||
| private static final int ZOOKEEPER_PORT = 2181; | ||
|
|
||
| private static final TestingAccumuloServer instance = new TestingAccumuloServer(); | ||
|
|
||
| private final FixedHostPortGenericContainer<?> accumuloContainer; | ||
|
|
||
| public static TestingAccumuloServer getInstance() | ||
| { | ||
| return instance; | ||
| } | ||
|
|
||
| private TestingAccumuloServer() | ||
| { | ||
| accumuloContainer = new FixedHostPortGenericContainer<>("prestodev/accumulo:35"); | ||
| accumuloContainer.withFixedExposedPort(ACCUMULO_MASTER_PORT, ACCUMULO_MASTER_PORT); | ||
| accumuloContainer.withFixedExposedPort(ACCUMULO_TSERVER_PORT, ACCUMULO_TSERVER_PORT); | ||
| accumuloContainer.withExposedPorts(ZOOKEEPER_PORT); | ||
| accumuloContainer.waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(10))); | ||
|
|
||
| // No need for an explicit stop since this server is a singleton | ||
| // and the container will be stopped by TestContainers on shutdown | ||
| // TODO Change this class to not be a singleton | ||
| // https://github.com/prestosql/presto/issues/5842 | ||
| accumuloContainer.start(); | ||
| } | ||
|
|
||
| public String getInstanceName() | ||
| { | ||
| return "default"; | ||
| } | ||
|
|
||
| public String getZooKeepers() | ||
| { | ||
| return format("%s:%s", accumuloContainer.getHost(), accumuloContainer.getMappedPort(ZOOKEEPER_PORT)); | ||
| } | ||
|
|
||
| public String getUser() | ||
| { | ||
| return "root"; | ||
| } | ||
|
|
||
| public String getPassword() | ||
| { | ||
| return "secret"; | ||
| } | ||
|
|
||
| public Connector getConnector() | ||
| { | ||
| try { | ||
| ZooKeeperInstance instance = new ZooKeeperInstance(getInstanceName(), getZooKeepers()); | ||
| return instance.getConnector(getUser(), new PasswordToken(getPassword())); | ||
| } | ||
| catch (AccumuloException | AccumuloSecurityException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using a singleton for now is fine as a transition from the old way, but we should move to a model where the Accumulo cluster is managed by
AccumuloQueryRunner, the same way we do for other testing services. Shutting down resources immediately is useful since the CI machines can be resource constrained, and using a non-singleton allows things like testing multiple versions, testing with different config, etc.Add a TODO here to make this not a singleton.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's create a github issue for this and add TODO comment (with link to the issue to the code).