SNO-172-upgrade-to-elasticsearch7 #296
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,10 +31,6 @@ | |
|
|
||
| # An index to store non-content metadata | ||
| META_MAPPING = { | ||
| 'dynamic_templates': [ | ||
| { | ||
| 'store_generic': { | ||
|
|
@@ -49,12 +45,6 @@ | |
| } | ||
|
|
||
|
|
||
| TEXT_FIELDS = ['pipeline_error_detail', 'description', 'notes'] | ||
|
|
||
|
|
||
|
|
@@ -90,7 +80,6 @@ def schema_mapping(name, schema): | |
| properties[k] = mapping | ||
| return { | ||
| 'type': 'object', | ||
| 'properties': properties, | ||
| } | ||
|
|
||
|
|
@@ -122,9 +111,7 @@ def schema_mapping(name, schema): | |
|
|
||
| if type_ == 'string': | ||
|
|
||
| if name in TEXT_FIELDS: | ||
| field_type = 'text' | ||
| else: | ||
| field_type = 'keyword' | ||
|
|
@@ -133,10 +120,6 @@ def schema_mapping(name, schema): | |
| 'type': field_type | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. No equivalent replacement of There was a problem hiding this comment. Here is the newer commit: afbe476#diff-13be881525721a1251be911ff12f4c7a722ced10eb689a96d8c5821e8d9cd0e8R140 |
||
| return sub_mapping | ||
|
|
||
| if type_ == 'number': | ||
|
|
@@ -167,12 +150,13 @@ def index_settings(): | |
| 'settings': { | ||
| 'index.max_result_window': 99999, | ||
| 'index.mapping.total_fields.limit': 5000, | ||
| 'index.number_of_shards': 1, | ||
| 'index.number_of_replicas': 0, | ||
Bek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 'index.max_ngram_diff': 32, | ||
| 'analysis': { | ||
| 'filter': { | ||
| 'substring': { | ||
| 'type': 'ngram', | ||
| 'min_gram': 1, | ||
| 'max_gram': 33 | ||
| }, | ||
|
|
@@ -273,10 +257,6 @@ def audit_mapping(): | |
|
|
||
| def es_mapping(mapping): | ||
| return { | ||
| 'dynamic_templates': [ | ||
| { | ||
| 'template_principals_allowed': { | ||
|
|
@@ -293,6 +273,7 @@ def es_mapping(mapping): | |
| 'match_mapping_type': "string", | ||
| 'mapping': { | ||
| 'type': 'keyword', | ||
| 'copy_to': '_all' | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -302,6 +283,7 @@ def es_mapping(mapping): | |
| 'match_mapping_type': "string", | ||
| 'mapping': { | ||
| 'type': 'keyword', | ||
| 'copy_to': '_all' | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -325,16 +307,19 @@ def es_mapping(mapping): | |
| } | ||
| }, | ||
| }, | ||
| }, | ||
| ], | ||
| 'properties': { | ||
| '_all': { | ||
| 'type': 'text', | ||
| 'store': False, | ||
| 'analyzer': 'snovault_search_analyzer' | ||
| }, | ||
| 'uuid': { | ||
| 'type': 'keyword', | ||
| }, | ||
| 'tid': { | ||
| 'type': 'keyword', | ||
| }, | ||
| 'item_type': { | ||
| 'type': 'keyword', | ||
|
|
@@ -343,33 +328,26 @@ def es_mapping(mapping): | |
| 'object': { | ||
| 'type': 'object', | ||
| 'enabled': False, | ||
| }, | ||
| 'properties': { | ||
| 'type': 'object', | ||
| 'enabled': False, | ||
| }, | ||
| 'propsheets': { | ||
| 'type': 'object', | ||
| 'enabled': False, | ||
| }, | ||
| 'embedded_uuids': { | ||
| 'type': 'keyword', | ||
| }, | ||
| 'linked_uuids': { | ||
| 'type': 'keyword', | ||
| }, | ||
| 'paths': { | ||
| 'type': 'keyword', | ||
| }, | ||
| 'audit': { | ||
| 'type': 'object', | ||
| 'properties': { | ||
| 'ERROR': { | ||
| 'type': 'object', | ||
|
|
@@ -465,19 +443,16 @@ def type_mapping(types, item_type, embed=True): | |
| for prop in props: | ||
| new_mapping = new_mapping[prop]['properties'] | ||
| new_mapping[last]['boost'] = boost | ||
| new_mapping[last]['copy_to'] = '_all' | ||
| return mapping | ||
|
|
||
|
|
||
| def create_elasticsearch_index(es, index, body): | ||
| es.indices.create(index=index, body=body, wait_for_active_shards=1, ignore=[400, 404], master_timeout='5m', request_timeout=300) | ||
|
|
||
|
|
||
| def set_index_mapping(es, index, mapping): | ||
| es.indices.put_mapping(index=index, body=mapping, ignore=[400], request_timeout=300) | ||
|
|
||
|
|
||
| def create_snovault_index_alias(es, indices): | ||
|
|
@@ -497,20 +472,19 @@ def run(app, collections=None, dry_run=False): | |
| indices = [] | ||
| for collection_name in collections: | ||
| if collection_name == 'meta': | ||
| mapping = META_MAPPING | ||
| else: | ||
| index = collection_name | ||
| collection = registry[COLLECTIONS].by_item_type[collection_name] | ||
| mapping = es_mapping(type_mapping(registry[TYPES], collection.type_info.item_type)) | ||
|
|
||
| if mapping is None: | ||
| continue # Testing collections | ||
| if dry_run: | ||
| print(json.dumps(sorted_dict({index: {collection_name: mapping}}), indent=4)) | ||
| continue | ||
| create_elasticsearch_index(es, index, index_settings()) | ||
| set_index_mapping(es, index, mapping) | ||
| if collection_name != 'meta': | ||
| indices.append(index) | ||
|
|
||
|
|
||
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this always had
propertieswhy the if/else now?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if there is no mapping directive exists in the schema, object should be stored without its fields being analyzed.
elseclause prevents unnecessary dynamic mapping andupdate_mappingevents in elasticsearch.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't seem to be working properly for some fields, e.g.
cloud_metadatain files. (Might have something to do with it being a calculated_property.)Before and after. Now you can't look up cloud_metadata.url=* for example.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, previous assumption was that if the field was important, it would be in the schema. This can be fixed, implication is that any other object inserted that doesn't have a mapping directive in the schema will have all of its field values be analyzed as keyword.