Fix Elasticsearch storage installer: ignore check index settings for updating in no-init running mode#9954
Merged
wu-sheng merged 4 commits intoapache:masterfrom Nov 12, 2022
Conversation
wankai123
added
bug
wu-sheng
reviewed
Nov 12, 2022
...a/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java
Show resolved
Hide resolved
wu-sheng
reviewed
Nov 12, 2022
Comment on lines
+115
to
+123
| boolean containsMapping = structures.containsMapping(tableName, createMapping(model)); | ||
| boolean compareIndexSetting = structures.compareIndexSetting(tableName, createSetting(model)); | ||
| // "no-init mode" no needs to check index settings for updating, | ||
| // to avoid conflicts between "init mode and no-init mode" index settings configurations | ||
| if (RunningMode.isNoInitMode()) { | ||
| exist = containsMapping; | ||
| } else { | ||
| exist = containsMapping && compareIndexSetting; | ||
| } |
Member
There was a problem hiding this comment.
A similar suggestion as above.
…src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java Co-authored-by: 吴晟 Wu Sheng <wu.sheng@foxmail.com>
Member
|
@wankai123 I didn't change it locally, so don't know whether it is 100% correct. |
wu-sheng
reviewed
Nov 12, 2022
...a/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java
Outdated
Show resolved
Hide resolved
…src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java
kezhenxu94
reviewed
Nov 12, 2022
...a/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java
Show resolved
Hide resolved
Member
|
The changes LGTM |
wu-sheng
approved these changes
Nov 12, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CHANGESlog.