This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/es8 in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 6c84cfa4ff836184d3e3e66243147d2b062c6903 Author: kezhenxu94 <[email protected]> AuthorDate: Wed Feb 16 13:22:50 2022 +0800 test --- .../skywalking/library/elasticsearch/ElasticSearchVersion.java | 5 +++++ .../storage/plugin/elasticsearch/base/StorageEsInstaller.java | 9 ++++----- test/e2e-v2/cases/storage/es/docker-compose.yml | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java index 5e78d34..4f51773 100644 --- a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java +++ b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java @@ -63,6 +63,11 @@ public final class ElasticSearchVersion { } return; } + if (major == 8) { + requestFactory = new V78RequestFactory(this); + codec = V78Codec.INSTANCE; + return; + } } throw new UnsupportedOperationException("Unsupported version: " + this); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java index 478e5ea..9960910 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java @@ -200,12 +200,12 @@ public class StorageEsInstaller extends ModelInstaller { protected Mappings createMapping(Model model) { Map<String, Object> properties = new HashMap<>(); for (ModelColumn columnDefine : model.getColumns()) { + final String type = columnTypeEsMapping.transform(columnDefine.getType(), columnDefine.getGenericType()); if (columnDefine.isMatchQuery()) { String matchCName = MatchCNameBuilder.INSTANCE.build(columnDefine.getColumnName().getName()); Map<String, Object> originalColumn = new HashMap<>(); - originalColumn.put( - "type", columnTypeEsMapping.transform(columnDefine.getType(), columnDefine.getGenericType())); + originalColumn.put("type", type); originalColumn.put("copy_to", matchCName); properties.put(columnDefine.getColumnName().getName(), originalColumn); @@ -215,9 +215,8 @@ public class StorageEsInstaller extends ModelInstaller { properties.put(matchCName, matchColumn); } else { Map<String, Object> column = new HashMap<>(); - column.put( - "type", columnTypeEsMapping.transform(columnDefine.getType(), columnDefine.getGenericType())); - if (columnDefine.isStorageOnly()) { + column.put("type", type); + if (columnDefine.isStorageOnly() && !"binary".equals(type)) { column.put("index", false); } properties.put(columnDefine.getColumnName().getName(), column); diff --git a/test/e2e-v2/cases/storage/es/docker-compose.yml b/test/e2e-v2/cases/storage/es/docker-compose.yml index d1881bd..221d427 100644 --- a/test/e2e-v2/cases/storage/es/docker-compose.yml +++ b/test/e2e-v2/cases/storage/es/docker-compose.yml @@ -25,6 +25,7 @@ services: environment: - discovery.type=single-node - cluster.routing.allocation.disk.threshold_enabled=false + - xpack.security.enabled=false healthcheck: test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"] interval: 5s
