You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@beam.apache.org by "ASF GitHub Bot (Jira)" <ji...@apache.org> on 2022/03/18 16:09:00 UTC
[jira] [Work logged] (BEAM-14003) Add support for Elasticsearch 8.x
[ https://issues.apache.org/jira/browse/BEAM-14003?focusedWorklogId=744206&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-744206 ]
ASF GitHub Bot logged work on BEAM-14003:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 18/Mar/22 16:08
Start Date: 18/Mar/22 16:08
Worklog Time Spent: 10m
Work Description: echauchot commented on a change in pull request #16953:
URL: https://github.com/apache/beam/pull/16953#discussion_r830086403
##########
File path: sdks/java/io/elasticsearch-tests/elasticsearch-tests-8/build.gradle
##########
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+plugins { id 'org.apache.beam.module' }
+applyJavaNature(
+ publish: false,
+ archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-8'
+)
+provideIntegrationTestingDependencies()
+enableJavaPerformanceTesting()
+
+description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 8.x"
+ext.summary = "Tests of ElasticsearchIO on Elasticsearch 8.x"
+
+def log4j_version = "2.17.1"
+def elastic_search_version = "8.0.0"
+
+configurations.all {
+ resolutionStrategy {
+ // Make sure the log4j versions for api and core match instead of taking the default
+ // Gradle rule of using the latest.
+ force "org.apache.logging.log4j:log4j-core:$log4j_version"
+ force "org.apache.logging.log4j:log4j-api:$log4j_version"
+ }
+}
+
+test {
+ maxParallelForks = 1
+}
+
+dependencies {
+ testImplementation project(path: ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-common", configuration: "testRuntimeMigration")
+ testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.5"
Review comment:
this is a leftover from the ES test fmwk
##########
File path: sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
##########
@@ -203,7 +203,7 @@
})
public class ElasticsearchIO {
- private static final List<Integer> VALID_CLUSTER_VERSIONS = Arrays.asList(2, 5, 6, 7);
+ private static final List<Integer> VALID_CLUSTER_VERSIONS = Arrays.asList(2, 5, 6, 7, 8);
Review comment:
please remove support for ES2, no more supported by Elastic themselves
##########
File path: sdks/java/io/elasticsearch-tests/elasticsearch-tests-8/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java
##########
@@ -0,0 +1,277 @@
+/*
+ * 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.beam.sdk.io.elasticsearch;
+
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.ConnectionConfiguration;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestCommon.getEsIndex;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestUtils.createConnectionConfig;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestUtils.createIndex;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestUtils.createTestContainer;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestUtils.deleteIndex;
+import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIOTestUtils.setDefaultTemplate;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import java.io.IOException;
+import java.io.Serializable;
+import org.apache.beam.sdk.testing.TestPipeline;
+import org.elasticsearch.client.RestClient;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+
+/*
+Cannot use @RunWith(JUnit4.class) with ESIntegTestCase
+Cannot have @BeforeClass @AfterClass with ESIntegTestCase
+*/
+
+/** Tests for {@link ElasticsearchIO} version 8. */
+@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
Review comment:
leftover see https://issues.apache.org/jira/browse/BEAM-13136
##########
File path: sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
##########
@@ -436,26 +436,41 @@ public static ConnectionConfiguration create(String[] addresses) {
* <li>index and type are empty string
* </ul>
*
- * <p>Valid endpoints therefore include:
+ * <p>Example valid endpoints therefore include:
*
* <ul>
* <li>/_bulk
* <li>/index_name/_bulk
* <li>/index_name/type_name/_bulk
* </ul>
*/
- public String getBulkEndPoint() {
+ public String getApiPrefix() {
StringBuilder sb = new StringBuilder();
if (!Strings.isNullOrEmpty(getIndex())) {
sb.append("/").append(getIndex());
}
if (!Strings.isNullOrEmpty(getType())) {
sb.append("/").append(getType());
}
- sb.append("/").append("_bulk");
return sb.toString();
}
+ public String getPrefixedEndpoint(String endpoint) {
+ return getApiPrefix() + "/" + endpoint;
+ }
+
+ public String getBulkEndPoint() {
+ return getPrefixedEndpoint("_bulk");
+ }
+
+ public String getSearchEndPoint() {
+ return getPrefixedEndpoint("_search");
+ }
+
+ public String getCountEndPoint() {
+ return getPrefixedEndpoint("_count");
+ }
+
Review comment:
clearer ! thx
##########
File path: sdks/java/io/elasticsearch-tests/elasticsearch-tests-8/src/test/contrib/create_elk_container.sh
##########
@@ -0,0 +1,24 @@
+#!/bin/sh
Review comment:
please remove this file as there is no ELK container available for 8.0
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 744206)
Time Spent: 1h (was: 50m)
> Add support for Elasticsearch 8.x
> ---------------------------------
>
> Key: BEAM-14003
> URL: https://issues.apache.org/jira/browse/BEAM-14003
> Project: Beam
> Issue Type: Improvement
> Components: io-java-elasticsearch
> Reporter: Evan Galpin
> Assignee: Evan Galpin
> Priority: P2
> Time Spent: 1h
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian Jira
(v8.20.1#820001)