nit0906 commented on code in PR #554:
URL: https://github.com/apache/jackrabbit-oak/pull/554#discussion_r861535555
##########
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java:
##########
@@ -70,62 +73,22 @@ public ElasticConnectionRule(String
elasticConnectionString) {
@Override
public Statement apply(Statement base, Description description) {
Statement s = super.apply(base, description);
- // see if docker is to be used or not... initialize docker rule only
if that's the case.
- final String pluginVersion = "7.16.3.0";
- final String pluginFileName = "elastiknn-" + pluginVersion + ".zip";
- final String localPluginPath = "target/" + pluginFileName;
- downloadSimilaritySearchPluginIfNotExists(localPluginPath,
pluginVersion);
if (elasticConnectionString == null ||
getElasticConnectionFromString() == null) {
- checkIfDockerClientAvailable();
- Network network = Network.newNetwork();
-
- elastic = new
ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" +
Version.CURRENT)
-
.withCopyFileToContainer(MountableFile.forHostPath(localPluginPath),
"/tmp/plugins/" + pluginFileName)
-
.withCopyFileToContainer(MountableFile.forClasspathResource("elasticstartscript.sh"),
"/tmp/elasticstartscript.sh")
- .withCommand("bash /tmp/elasticstartscript.sh")
- .withNetwork(network);
- elastic.start();
-
+ elastic = ElasticTestServer.getESTestServer().container();
setUseDocker(true);
}
return s;
}
@Override
protected void after() {
- if (elastic != null && elastic.isRunning()) {
- elastic.stop();
- }
- }
-
- private void downloadSimilaritySearchPluginIfNotExists(String
localPluginPath, String pluginVersion) {
- File pluginFile = new File(localPluginPath);
- if (!pluginFile.exists()) {
- LOG.info("Plugin file {} doesn't exist. Trying to download.",
localPluginPath);
- try (CloseableHttpClient client = HttpClients.createDefault()) {
- HttpGet get = new
HttpGet("https://github.com/alexklibisz/elastiknn/releases/download/"; +
pluginVersion
- + "/elastiknn-" + pluginVersion + ".zip");
- CloseableHttpResponse response = client.execute(get);
- InputStream inputStream = response.getEntity().getContent();
- MessageDigest messageDigest =
MessageDigest.getInstance("SHA-256");
- DigestInputStream dis = new DigestInputStream(inputStream,
messageDigest);
- FileOutputStream outputStream = new
FileOutputStream(pluginFile);
- IOUtils.copy(dis, outputStream);
- messageDigest = dis.getMessageDigest();
- // bytes to hex
- StringBuilder result = new StringBuilder();
- for (byte b : messageDigest.digest()) {
- result.append(String.format("%02x", b));
- }
- if (!PLUGIN_DIGEST.equals(result.toString())) {
- String deleteString = "Downloaded plugin file deleted.";
- if (!pluginFile.delete()) {
- deleteString = "Could not delete downloaded plugin
file.";
- }
- throw new RuntimeException("Plugin digest unequal. Found "
+ result + ". Expected " + PLUGIN_DIGEST + ". " + deleteString);
- }
- } catch (IOException | NoSuchAlgorithmException e) {
- throw new RuntimeException("Could not download similarity
search plugin", e);
+ ElasticConnection esConnection = useDocker() ?
getElasticConnectionForDocker() : getElasticConnectionFromString();
+ if (esConnection != null) {
+ try {
+ esConnection.getClient().indices().delete(new
DeleteIndexRequest(esConnection.getIndexPrefix() + "*"),
RequestOptions.DEFAULT);
+ esConnection.close();
+ } catch (IOException e) {
+ LOG.error("Unable to delete indexes with prefix {}",
esConnection.getIndexPrefix());
Review Comment:
@fabriziofortino - the tearDown there runs after every method (indexes are
created before every method and then cleaned up after it's executed), which is
needed for a few cases there.
But unfortunately not all tests extend that, that's why I added one in the
ElasticConnectionRule.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
