forked from opendistro-for-elasticsearch/index-management
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
schema mapping change (opendistro-for-elasticsearch#198) (opendistro-…
…for-elasticsearch#200) * check schema version for IndexConfig mapping acknowledge false in case indexmetadata does not exist
- Loading branch information
1 parent
03b0a2e
commit 43cb503
Showing
12 changed files
with
384 additions
and
24 deletions.
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
128 changes: 128 additions & 0 deletions
128
...main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtils.kt
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 |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.indexstatemanagement.util | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin | ||
| import org.apache.logging.log4j.LogManager | ||
| import org.elasticsearch.action.ActionListener | ||
| import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest | ||
| import org.elasticsearch.action.support.master.AcknowledgedResponse | ||
| import org.elasticsearch.client.IndicesAdminClient | ||
| import org.elasticsearch.cluster.ClusterState | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData | ||
| import org.elasticsearch.common.xcontent.LoggingDeprecationHandler | ||
| import org.elasticsearch.common.xcontent.NamedXContentRegistry | ||
| import org.elasticsearch.common.xcontent.XContentParser | ||
| import org.elasticsearch.common.xcontent.XContentType | ||
|
|
||
| class IndexUtils { | ||
| companion object { | ||
| @Suppress("ObjectPropertyNaming") | ||
| const val _META = "_meta" | ||
| const val SCHEMA_VERSION = "schema_version" | ||
| const val DEFAULT_SCHEMA_VERSION = 1L | ||
| val logger = LogManager.getLogger(IndexUtils::class.java) | ||
|
|
||
| var indexManagementSchemaVersion: Long | ||
| private set | ||
| var indexManagementHistoryVersion: Long | ||
| private set | ||
|
|
||
| init { | ||
| indexManagementSchemaVersion = getSchemaVersion(IndexStateManagementIndices.indexStateManagementMappings) | ||
| indexManagementHistoryVersion = getSchemaVersion(IndexStateManagementIndices.indexStateManagementHistoryMappings) | ||
| } | ||
|
|
||
| fun getSchemaVersion(mapping: String): Long { | ||
| val xcp = XContentType.JSON.xContent().createParser(NamedXContentRegistry.EMPTY, | ||
| LoggingDeprecationHandler.INSTANCE, mapping) | ||
|
|
||
| while (!xcp.isClosed) { | ||
| val token = xcp.currentToken() | ||
| if (token != null && token != XContentParser.Token.END_OBJECT && token != XContentParser.Token.START_OBJECT) { | ||
| if (xcp.currentName() != _META) { | ||
| xcp.nextToken() | ||
| xcp.skipChildren() | ||
| } else { | ||
| while (xcp.nextToken() != XContentParser.Token.END_OBJECT) { | ||
| when (xcp.currentName()) { | ||
| SCHEMA_VERSION -> { | ||
| val version = xcp.longValue() | ||
| require(version > -1) | ||
| return version | ||
| } | ||
| else -> xcp.nextToken() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| xcp.nextToken() | ||
| } | ||
| return DEFAULT_SCHEMA_VERSION | ||
| } | ||
|
|
||
| fun shouldUpdateIndex(index: IndexMetaData, newVersion: Long): Boolean { | ||
| var oldVersion = DEFAULT_SCHEMA_VERSION | ||
|
|
||
| val indexMapping = index.mapping()?.sourceAsMap() | ||
| if (indexMapping != null && indexMapping.containsKey(_META) && indexMapping[_META] is HashMap<*, *>) { | ||
| val metaData = indexMapping[_META] as HashMap<*, *> | ||
| if (metaData.containsKey(SCHEMA_VERSION)) { | ||
| oldVersion = (metaData[SCHEMA_VERSION] as Int).toLong() | ||
| } | ||
| } | ||
| return newVersion > oldVersion | ||
| } | ||
|
|
||
| fun checkAndUpdateConfigIndexMapping( | ||
| clusterState: ClusterState, | ||
| client: IndicesAdminClient, | ||
| actionListener: ActionListener<AcknowledgedResponse> | ||
| ) { | ||
| checkAndUpdateIndexMapping( | ||
| IndexStateManagementPlugin.INDEX_STATE_MANAGEMENT_INDEX, | ||
| indexManagementSchemaVersion, | ||
| IndexStateManagementIndices.indexStateManagementMappings, | ||
| clusterState, | ||
| client, | ||
| actionListener | ||
| ) | ||
| } | ||
|
|
||
| @OpenForTesting | ||
| fun checkAndUpdateIndexMapping( | ||
| index: String, | ||
| schemaVersion: Long, | ||
| mapping: String, | ||
| clusterState: ClusterState, | ||
| client: IndicesAdminClient, | ||
| actionListener: ActionListener<AcknowledgedResponse> | ||
| ) { | ||
| if (clusterState.metaData.indices.containsKey(index)) { | ||
| if (shouldUpdateIndex(clusterState.metaData.indices[index], schemaVersion)) { | ||
| val putMappingRequest: PutMappingRequest = PutMappingRequest(index).type(_DOC).source(mapping, XContentType.JSON) | ||
| client.putMapping(putMappingRequest, actionListener) | ||
| } else { | ||
| actionListener.onResponse(AcknowledgedResponse(true)) | ||
| } | ||
| } else { | ||
| logger.error("IndexMetaData does not exist for $index") | ||
| actionListener.onResponse(AcknowledgedResponse(false)) | ||
| } | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| { | ||
| "_meta" : { | ||
| "schema_version": 2 | ||
| }, | ||
| "dynamic": "strict", | ||
| "properties": { | ||
| "policy": { | ||
|
|
||
Oops, something went wrong.