kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused ES7 config (#3998)

This commit is contained in:
kezhenxu94 2019-12-04 00:20:10 +08:00 committed by zhang-wei
parent 3e22ff5ece
commit aa022ffa00
5 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apm-dist/src/main/assembly/application.yml
View File

@ -116,7 +116,6 @@ storage:
# resultWindowMaxSize: ${SW_STORAGE_ES_QUERY_MAX_WINDOW_SIZE:10000}
# metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000}
# segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200}
# indexMaxResultWindow: ${SW_STORAGE_ES_INDEX_MAX_RESULT_WINDOW:5000}
h2:
driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource}
url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db}

17
docs/en/setup/backend/backend-storage.md
View File

@ -35,7 +35,7 @@ storage:
- For ElasticSearch 6.3.2 ~ 7.0.0 (excluded), please download the `apache-skywalking-bin.tar.gz` or `apache-skywalking-bin.zip`,
- For ElasticSearch 7.0.0 ~ 8.0.0 (excluded), please download the `apache-skywalking-bin-es7.tar.gz` or `apache-skywalking-bin-es7.zip`.
ElasticSearch 6 and ElasticSearch 7 share most of the configurations, as follows:
For now, ElasticSearch 6 and ElasticSearch 7 share the same configurations, as follows:
Setting fragment example
@ -66,19 +66,6 @@ storage:
advanced: ${SW_STORAGE_ES_ADVANCED:""}
```
and there're also some configurations that are ES7 specific, as follows:
```yaml
storage:
elasticsearch7:
# ... the configurations shared with ES6 that are listed above ...
# Index max result window, for segment deep pagination, usually we don't recommend to scroll too many pages,
# instead, give more query criteria (e.g. service id or time range), to narrow the query results.
# see https://www.elastic.co/guide/en/elasticsearch/guide/current/pagination.html for more information
indexMaxResultWindow: ${SW_STORAGE_ES_INDEX_MAX_RESULT_WINDOW:5000}
```
### ElasticSearch 6 With Https SSL Encrypting communications.
example:
@ -132,7 +119,7 @@ thread_pool.index.queue_size: 1000 # Only suitable for ElasticSearch 6
thread_pool.write.queue_size: 1000 # Suitable for ElasticSearch 6 and 7
# When you face query error at trace page, remember to check this.
index.max_result_window: 1000000 # Only suitable for ElasticSearch 6. For ES 7, set `indexMaxResultWindow` under `storage`-`elasticsearch7` section in application.yml
index.max_result_window: 1000000
```
We strongly advice you to read more about these configurations from ElasticSearch official document.

4
oap-server/server-bootstrap/src/main/resources/application.yml
View File

@ -116,10 +116,6 @@ storage:
resultWindowMaxSize: ${SW_STORAGE_ES_QUERY_MAX_WINDOW_SIZE:10000}
metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000}
segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200}
# Index max result window, for segment deep pagination, usually we don't recommend to scroll too many pages,
# instead, give more query criteria (e.g. service id or time range), to narrow the query results.
# see https://www.elastic.co/guide/en/elasticsearch/guide/current/pagination.html for more information
indexMaxResultWindow: ${SW_STORAGE_ES_INDEX_MAX_RESULT_WINDOW:5000}
advanced: ${SW_STORAGE_ES_ADVANCED:""}
# h2:
# driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource}

9
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java
View File

@ -24,13 +24,4 @@ import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.StorageModu
* @author kezhenxu94
*/
public class StorageModuleElasticsearch7Config extends StorageModuleElasticsearchConfig {
private int indexMaxResultWindow;
public int getIndexMaxResultWindow() {
return indexMaxResultWindow;
}
public void setIndexMaxResultWindow(final int indexMaxResultWindow) {
this.indexMaxResultWindow = indexMaxResultWindow;
}
}

13
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java
View File

@ -34,12 +34,9 @@ public class StorageEs7Installer extends StorageEsInstaller {
private static final Logger logger = LoggerFactory.getLogger(StorageEs7Installer.class);
private final StorageModuleElasticsearch7Config config;
public StorageEs7Installer(final ModuleManager moduleManager,
final StorageModuleElasticsearch7Config config) {
super(moduleManager, config);
this.config = config;
}
@SuppressWarnings("unchecked")
@ -52,14 +49,4 @@ public class StorageEs7Installer extends StorageEsInstaller {
return mapping;
}
protected Map<String, Object> createSetting(boolean record) {
Map<String, Object> setting = super.createSetting(record);
if (config.getIndexMaxResultWindow() > 0) {
setting.put("index.max_result_window", config.getIndexMaxResultWindow());
}
return setting;
}
}