Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix deadlock problem when using elasticsearch-client-7.0.0 #5775

Merged
merged 8 commits into from
Nov 3, 2020
Merged

Fix deadlock problem when using elasticsearch-client-7.0.0 #5775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
74267b7
Update elasticsearch client 7.0.0 to elasticsearch client 7.5.0.
zifeihan Nov 2, 2020
63ad778
Merge branch 'master' into es_client7_update
wu-sheng Nov 2, 2020
e9f87b4
Update CHANGES.md and LICENSE.
zifeihan Nov 2, 2020
2b0c3c2
Merge remote-tracking branch 'origin/es_client7_update' into es_clien…
zifeihan Nov 2, 2020
54e9861
Polishing.
zifeihan Nov 3, 2020
a9faa4f
Merge branch 'master' into es_client7_update
kezhenxu94 Nov 3, 2020
8eda9ef
Update LICENSE.
zifeihan Nov 3, 2020
1024e7e
Merge branch 'master' into es_client7_update
wu-sheng Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist-material/release-docs/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ The text of each license is the standard Apache 2.0 license.
Google: proto-google-common-protos 1.17.0: https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
Elasticsearch BV (Elasticsearch) 6.3.2: https://www.elastic.co/products/elasticsearch , Apache 2.0
Elasticsearch BV (Elasticsearch) 7.0.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
Elasticsearch BV (Elasticsearch) 7.5.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
lang-mustache-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/lang-mustache , Apache 2.0
parent-join-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/parent-join , Apache 2.0
reindex-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/reindex , Apache 2.0
Expand Down
2 changes: 1 addition & 1 deletion oap-server/server-starter-es7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<packaging>jar</packaging>

<properties>
<elasticsearch.version>7.0.0</elasticsearch.version>
<elasticsearch.version>7.5.0</elasticsearch.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<artifactId>storage-elasticsearch7-plugin</artifactId>

<properties>
<elasticsearch.version>7.0.0</elasticsearch.version>
<elasticsearch.version>7.5.0</elasticsearch.version>
</properties>

<dependencyManagement>
Expand Down
23 changes: 12 additions & 11 deletions tools/dependencies/known-oap-backend-dependencies-es7.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,18 @@ curator-client-4.0.1.jar
curator-framework-4.0.1.jar
curator-recipes-4.0.1.jar
curator-x-discovery-4.0.1.jar
elasticsearch-7.0.0.jar
elasticsearch-cli-7.0.0.jar
elasticsearch-core-7.0.0.jar
elasticsearch-geo-7.0.0.jar
elasticsearch-rest-client-7.0.0.jar
elasticsearch-rest-high-level-client-7.0.0.jar
elasticsearch-secure-sm-7.0.0.jar
elasticsearch-x-content-7.0.0.jar
elasticsearch-7.5.0.jar
elasticsearch-cli-7.5.0.jar
elasticsearch-core-7.5.0.jar
elasticsearch-geo-7.5.0.jar
elasticsearch-rest-client-7.5.0.jar
elasticsearch-rest-high-level-client-7.5.0.jar
elasticsearch-secure-sm-7.5.0.jar
elasticsearch-x-content-7.5.0.jar
lang-mustache-client-7.5.0.jar
mapper-extras-client-7.5.0.jar
parent-join-client-7.5.0.jar
rank-eval-client-7.5.0.jar
Comment on lines +40 to +43
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to update LICENSE including

  1. Versions of lang-mustache-client and parent-join-client
  2. Add mapper-extras-client with license as we missed before
  3. Add rank-eval-client with license as we missed before, both 6.3.2(es6 package) and 7.5.0(you updated)

error_prone_annotations-2.3.2.jar
etcd4j-2.17.0.jar
failureaccess-1.0.1.jar
Expand Down Expand Up @@ -97,7 +101,6 @@ json-flattener-0.6.0.jar
jsr305-3.0.2.jar
kotlin-reflect-1.1.1.jar
kotlin-stdlib-1.1.60.jar
lang-mustache-client-7.0.0.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-1.2.16.jar
log4j-api-2.9.0.jar
Expand Down Expand Up @@ -142,12 +145,10 @@ netty-tcnative-boringssl-static-2.0.26.Final.jar
netty-transport-4.1.42.Final.jar
okhttp-3.9.0.jar
okio-1.13.0.jar
parent-join-client-7.0.0.jar
perfmark-api-0.19.0.jar
proto-google-common-protos-1.17.0.jar
protobuf-java-3.13.0.jar
protobuf-java-util-3.12.4.jar
rank-eval-client-7.0.0.jar
reactive-streams-1.0.2.jar
reflectasm-1.11.7.jar
resourcecify-annotations-0.21.0.jar
Expand Down