From 01dd0242862a2d8701905a431073dc2ca2fffd88 Mon Sep 17 00:00:00 2001 From: Rupanshi Sharma Date: Thu, 23 Jun 2022 08:54:12 -0700 Subject: [PATCH] Renames master/Master to clusterManager/ClusterManager as mentioned here: https://github.com/opensearch-project/OpenSearch/issues/3542 Signed-off-by: Rupanshi Sharma --- .../opensearch/indexmanagement/IndexManagementIndices.kt | 2 +- .../indexstatemanagement/IndexStateManagementHistory.kt | 6 +++--- .../indexstatemanagement/ManagedIndexCoordinator.kt | 2 +- .../indexstatemanagement/MetadataService.kt | 2 +- .../indexstatemanagement/resthandler/RestExplainAction.kt | 4 ++-- .../resthandler/RestRetryFailedManagedIndexAction.kt | 4 ++-- .../step/allocation/AttemptAllocationStep.kt | 2 +- .../indexstatemanagement/step/delete/AttemptDeleteStep.kt | 2 +- .../step/forcemerge/AttemptSetReadOnlyStep.kt | 2 +- .../step/indexpriority/AttemptSetIndexPriorityStep.kt | 2 +- .../indexstatemanagement/step/readonly/SetReadOnlyStep.kt | 2 +- .../step/readwrite/SetReadWriteStep.kt | 2 +- .../step/replicacount/AttemptReplicaCountStep.kt | 2 +- .../step/rollup/AttemptCreateRollupJobStep.kt | 2 +- .../step/shrink/AttemptMoveShardsStep.kt | 2 +- .../indexstatemanagement/step/shrink/ShrinkStep.kt | 2 +- .../indexstatemanagement/step/shrink/WaitForShrinkStep.kt | 2 +- .../action/addpolicy/TransportAddPolicyAction.kt | 2 +- .../action/changepolicy/TransportChangePolicyAction.kt | 2 +- .../transport/action/explain/TransportExplainAction.kt | 4 ++-- .../action/indexpolicy/TransportIndexPolicyAction.kt | 2 +- .../transport/action/managedIndex/ManagedIndexAction.kt | 2 +- .../action/managedIndex/TransportManagedIndexAction.kt | 2 +- .../action/removepolicy/TransportRemovePolicyAction.kt | 2 +- .../TransportRetryFailedManagedIndexAction.kt | 2 +- .../TransportUpdateManagedIndexMetaDataAction.kt | 8 ++++---- .../UpdateManagedIndexMetaDataAction.kt | 2 +- .../UpdateManagedIndexMetaDataRequest.kt | 2 +- .../indexstatemanagement/util/RestHandlerUtils.kt | 2 +- .../indexstatemanagement/util/StepUtils.kt | 2 +- .../indexmanagement/rollup/RollupMapperService.kt | 2 +- .../rollup/action/index/TransportIndexRollupAction.kt | 2 +- .../action/mapping/TransportUpdateRollupMappingAction.kt | 8 ++++---- .../rollup/action/mapping/UpdateRollupMappingAction.kt | 2 +- .../rollup/action/mapping/UpdateRollupMappingRequest.kt | 2 +- .../rollup/action/start/StartRollupAction.kt | 2 +- .../rollup/action/start/TransportStartRollupAction.kt | 2 +- .../rollup/action/stop/StopRollupAction.kt | 2 +- .../rollup/action/stop/TransportStopRollupAction.kt | 2 +- .../action/index/TransportIndexTransformAction.kt | 2 +- .../transform/action/start/StartTransformAction.kt | 2 +- .../action/start/TransportStartTransformAction.kt | 2 +- .../transform/action/stop/StopTransformAction.kt | 2 +- .../transform/action/stop/TransportStopTransformAction.kt | 2 +- .../org/opensearch/indexmanagement/util/IndexUtils.kt | 2 +- .../indexstatemanagement/MetadataRegressionIT.kt | 2 +- .../indexstatemanagement/step/AttemptDeleteStepTests.kt | 2 +- .../step/AttemptSetIndexPriorityStepTests.kt | 2 +- .../step/AttemptSetReplicaCountStepTests.kt | 2 +- .../indexstatemanagement/step/SetReadOnlyStepTests.kt | 2 +- .../indexstatemanagement/step/SetReadWriteStepTests.kt | 2 +- 51 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/kotlin/org/opensearch/indexmanagement/IndexManagementIndices.kt b/src/main/kotlin/org/opensearch/indexmanagement/IndexManagementIndices.kt index 54a2f1cf7..40f55e070 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/IndexManagementIndices.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/IndexManagementIndices.kt @@ -14,7 +14,7 @@ import org.opensearch.action.admin.indices.create.CreateIndexRequest import org.opensearch.action.admin.indices.create.CreateIndexResponse import org.opensearch.action.admin.indices.exists.indices.IndicesExistsRequest import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient import org.opensearch.cluster.service.ClusterService diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt index 763603ecc..fdeb58720 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt @@ -17,7 +17,7 @@ import org.opensearch.action.bulk.BulkRequest import org.opensearch.action.bulk.BulkResponse import org.opensearch.action.index.IndexRequest import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.LocalNodeMasterListener import org.opensearch.cluster.service.ClusterService @@ -82,7 +82,7 @@ class IndexStateManagementHistory( } } - override fun onMaster() { + override fun onClusterManager() { try { // try to rollover immediately as we might be restarting the cluster if (historyEnabled) rolloverHistoryIndex() @@ -97,7 +97,7 @@ class IndexStateManagementHistory( } } - override fun offMaster() { + override fun offClusterManager() { scheduledRollover?.cancel() } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt index 9cdf89b5f..c3b3f0068 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt @@ -27,7 +27,7 @@ import org.opensearch.action.search.SearchPhaseExecutionException import org.opensearch.action.search.SearchRequest import org.opensearch.action.search.SearchResponse import org.opensearch.action.search.SearchScrollRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.client.Client import org.opensearch.cluster.ClusterChangedEvent diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt index b69fcac5c..17f7271bc 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt @@ -15,7 +15,7 @@ import org.opensearch.action.bulk.BackoffPolicy import org.opensearch.action.bulk.BulkItemResponse import org.opensearch.action.bulk.BulkRequest import org.opensearch.action.bulk.BulkResponse -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.service.ClusterService import org.opensearch.common.settings.Settings diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt index 4db7dc6ed..16ed2a684 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.resthandler import org.apache.logging.log4j.LogManager -import org.opensearch.action.support.master.MasterNodeRequest +import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest import org.opensearch.client.node.NodeClient import org.opensearch.common.Strings import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI @@ -77,7 +77,7 @@ class RestExplainAction : BaseRestHandler() { val explainRequest = ExplainRequest( indices.toList(), request.paramAsBoolean("local", false), - request.paramAsTime("master_timeout", MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT), + request.paramAsTime("master_timeout", ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT), SearchParams(size, from, sortField, sortOrder, queryString), request.paramAsBoolean(SHOW_POLICY_QUERY_PARAM, DEFAULT_EXPLAIN_SHOW_POLICY), indexType diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt index 4580dc54d..2d3fe7add 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt @@ -5,7 +5,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.resthandler -import org.opensearch.action.support.master.MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT +import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest import org.opensearch.client.node.NodeClient import org.opensearch.common.Strings import org.opensearch.common.xcontent.XContentHelper @@ -62,7 +62,7 @@ class RestRetryFailedManagedIndexAction : BaseRestHandler() { val retryFailedRequest = RetryFailedManagedIndexRequest( indices.toList(), body["state"] as String?, - request.paramAsTime("master_timeout", DEFAULT_MASTER_NODE_TIMEOUT), + request.paramAsTime("master_timeout", ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT), indexType ) diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt index 4d18652b1..de360af6b 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt @@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.allocation import org.apache.logging.log4j.LogManager import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.indexstatemanagement.action.AllocationAction import org.opensearch.indexmanagement.opensearchapi.suspendUntil diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt index 8019130a2..3cc2a1901 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.delete import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.delete.DeleteIndexRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.indexmanagement.opensearchapi.suspendUntil import org.opensearch.indexmanagement.spi.indexstatemanagement.Step import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt index b1f82f314..4d77d2b4b 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.forcemerge import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata.SETTING_BLOCKS_WRITE import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.indexstatemanagement.action.ForceMergeAction diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt index 1ce082aaf..0ce0c61dc 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.indexpriority import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata.SETTING_PRIORITY import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.indexstatemanagement.action.IndexPriorityAction diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt index b821d5b59..c26f5eea3 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.readonly import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata.SETTING_BLOCKS_WRITE import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.opensearchapi.suspendUntil diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt index 91e4d1a54..99e2a63be 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.readwrite import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata.SETTING_BLOCKS_WRITE import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.opensearchapi.suspendUntil diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptReplicaCountStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptReplicaCountStep.kt index 4599668c8..7179265df 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptReplicaCountStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptReplicaCountStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.replicacount import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS import org.opensearch.common.settings.Settings import org.opensearch.indexmanagement.indexstatemanagement.action.ReplicaCountAction diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/rollup/AttemptCreateRollupJobStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/rollup/AttemptCreateRollupJobStep.kt index e4a6c6392..27698571a 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/rollup/AttemptCreateRollupJobStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/rollup/AttemptCreateRollupJobStep.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.rollup import org.apache.logging.log4j.LogManager import org.opensearch.ExceptionsHelper import org.opensearch.action.support.WriteRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.index.engine.VersionConflictEngineException import org.opensearch.indexmanagement.indexstatemanagement.action.RollupAction import org.opensearch.indexmanagement.opensearchapi.suspendUntil diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt index 552a73c2e..f7d9cc8c4 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt @@ -12,7 +12,7 @@ import org.opensearch.action.admin.cluster.reroute.ClusterRerouteResponse import org.opensearch.action.admin.indices.stats.IndicesStatsRequest import org.opensearch.action.admin.indices.stats.IndicesStatsResponse import org.opensearch.action.admin.indices.stats.ShardStats -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexMetadata.SETTING_BLOCKS_WRITE import org.opensearch.cluster.metadata.MetadataCreateIndexService.validateIndexOrAliasName diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/ShrinkStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/ShrinkStep.kt index fe29857c0..af3c65651 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/ShrinkStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/ShrinkStep.kt @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger import org.opensearch.ExceptionsHelper import org.opensearch.OpenSearchSecurityException import org.opensearch.action.admin.indices.delete.DeleteIndexRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.indexmanagement.indexstatemanagement.action.ShrinkAction.Companion.getSecurityFailureMessage import org.opensearch.indexmanagement.indexstatemanagement.util.getUpdatedShrinkActionProperties import org.opensearch.indexmanagement.indexstatemanagement.util.releaseShrinkLock diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt index 319f6d2ea..55ef04bb0 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt @@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.shrink import org.opensearch.action.admin.indices.stats.IndicesStatsRequest import org.opensearch.action.admin.indices.stats.IndicesStatsResponse -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.service.ClusterService import org.opensearch.common.settings.Settings diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/addpolicy/TransportAddPolicyAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/addpolicy/TransportAddPolicyAction.kt index 0efdd0686..a5e7df89e 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/addpolicy/TransportAddPolicyAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/addpolicy/TransportAddPolicyAction.kt @@ -25,7 +25,7 @@ import org.opensearch.action.get.MultiGetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.node.NodeClient import org.opensearch.cluster.block.ClusterBlockException import org.opensearch.cluster.service.ClusterService diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/changepolicy/TransportChangePolicyAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/changepolicy/TransportChangePolicyAction.kt index fed9cf828..c18572cad 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/changepolicy/TransportChangePolicyAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/changepolicy/TransportChangePolicyAction.kt @@ -24,7 +24,7 @@ import org.opensearch.action.get.MultiGetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.node.NodeClient import org.opensearch.cluster.metadata.IndexMetadata import org.opensearch.cluster.service.ClusterService diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt index 0ae61fc8d..319a5ba92 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt @@ -21,7 +21,7 @@ import org.opensearch.action.search.SearchRequest import org.opensearch.action.search.SearchResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.node.NodeClient import org.opensearch.cluster.metadata.IndexMetadata import org.opensearch.cluster.service.ClusterService @@ -251,7 +251,7 @@ class TransportExplainAction @Inject constructor( .indices(*indexNames.toTypedArray()) .metadata(true) .local(request.local) - .masterNodeTimeout(request.clusterManagerTimeout) + .clusterManagerNodeTimeout(request.clusterManagerTimeout) client.admin().cluster().state( clusterStateRequest, diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt index d16e332c8..d7059d5dd 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt @@ -16,7 +16,7 @@ import org.opensearch.action.search.SearchRequest import org.opensearch.action.search.SearchResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.node.NodeClient import org.opensearch.cluster.service.ClusterService import org.opensearch.common.inject.Inject diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/ManagedIndexAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/ManagedIndexAction.kt index d08cbc1cb..8637b2bb3 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/ManagedIndexAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/ManagedIndexAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.transport.action.managedIndex import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse class ManagedIndexAction : ActionType(NAME, ::AcknowledgedResponse) { companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/TransportManagedIndexAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/TransportManagedIndexAction.kt index a1030eba8..cf734b928 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/TransportManagedIndexAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/managedIndex/TransportManagedIndexAction.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.transport.action.man import org.opensearch.action.ActionListener import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.service.ClusterService import org.opensearch.common.inject.Inject import org.opensearch.tasks.Task diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/removepolicy/TransportRemovePolicyAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/removepolicy/TransportRemovePolicyAction.kt index 1e14b525a..759fc9a2c 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/removepolicy/TransportRemovePolicyAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/removepolicy/TransportRemovePolicyAction.kt @@ -23,7 +23,7 @@ import org.opensearch.action.get.MultiGetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.node.NodeClient import org.opensearch.cluster.block.ClusterBlockException import org.opensearch.cluster.metadata.IndexMetadata.INDEX_BLOCKS_READ_ONLY_ALLOW_DELETE_SETTING diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/retryfailedmanagedindex/TransportRetryFailedManagedIndexAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/retryfailedmanagedindex/TransportRetryFailedManagedIndexAction.kt index fb88ac4f8..ee26cf317 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/retryfailedmanagedindex/TransportRetryFailedManagedIndexAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/retryfailedmanagedindex/TransportRetryFailedManagedIndexAction.kt @@ -22,7 +22,7 @@ import org.opensearch.action.get.MultiGetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.client.node.NodeClient import org.opensearch.cluster.block.ClusterBlockException diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt index cc70132ad..2559a0d67 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt @@ -8,8 +8,8 @@ package org.opensearch.indexmanagement.indexstatemanagement.transport.action.upd import org.apache.logging.log4j.LogManager import org.opensearch.action.ActionListener import org.opensearch.action.support.ActionFilters -import org.opensearch.action.support.master.AcknowledgedResponse -import org.opensearch.action.support.master.TransportMasterNodeAction +import org.opensearch.action.support.clustermanager.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction import org.opensearch.cluster.ClusterState import org.opensearch.cluster.ClusterStateTaskConfig import org.opensearch.cluster.ClusterStateTaskExecutor @@ -39,7 +39,7 @@ class TransportUpdateManagedIndexMetaDataAction @Inject constructor( actionFilters: ActionFilters, val indexMetadataProvider: IndexMetadataProvider, indexNameExpressionResolver: IndexNameExpressionResolver -) : TransportMasterNodeAction( +) : TransportClusterManagerNodeAction( UpdateManagedIndexMetaDataAction.INSTANCE.name(), transportService, clusterService, @@ -76,7 +76,7 @@ class TransportUpdateManagedIndexMetaDataAction @Inject constructor( .toTypedArray() } - override fun masterOperation( + override fun clusterManagerOperation( request: UpdateManagedIndexMetaDataRequest, state: ClusterState, listener: ActionListener diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataAction.kt index 6c87d1c97..2a1264322 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.common.io.stream.Writeable class UpdateManagedIndexMetaDataAction : ActionType(NAME, reader) { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataRequest.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataRequest.kt index 3fa8e436c..077cfde0c 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataRequest.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/UpdateManagedIndexMetaDataRequest.kt @@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.transport.action.upd import org.opensearch.action.ActionRequestValidationException import org.opensearch.action.ValidateActions.addValidationError -import org.opensearch.action.support.master.AcknowledgedRequest +import org.opensearch.action.support.clustermanager.AcknowledgedRequest import org.opensearch.common.io.stream.StreamInput import org.opensearch.common.io.stream.StreamOutput import org.opensearch.index.Index diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/RestHandlerUtils.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/RestHandlerUtils.kt index 31b5b4b48..82811a6a9 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/RestHandlerUtils.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/RestHandlerUtils.kt @@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.util import org.apache.logging.log4j.Logger -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.common.io.stream.StreamInput import org.opensearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/StepUtils.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/StepUtils.kt index 8ec297d27..80ff25869 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/StepUtils.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/util/StepUtils.kt @@ -13,7 +13,7 @@ import org.opensearch.action.admin.cluster.health.ClusterHealthResponse import org.opensearch.action.admin.cluster.node.stats.NodeStats import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest import org.opensearch.action.admin.indices.stats.ShardStats -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexMetadata import org.opensearch.cluster.node.DiscoveryNodes diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt index ab7c5b195..e861cfb00 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt @@ -15,7 +15,7 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.metadata.MappingMetadata diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/index/TransportIndexRollupAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/index/TransportIndexRollupAction.kt index ce18a94d6..03e84d06f 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/index/TransportIndexRollupAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/index/TransportIndexRollupAction.kt @@ -15,7 +15,7 @@ import org.opensearch.action.index.IndexRequest import org.opensearch.action.index.IndexResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.service.ClusterService import org.opensearch.common.inject.Inject diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/TransportUpdateRollupMappingAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/TransportUpdateRollupMappingAction.kt index 74d94d41f..17bc0a146 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/TransportUpdateRollupMappingAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/TransportUpdateRollupMappingAction.kt @@ -9,8 +9,8 @@ import org.apache.logging.log4j.LogManager import org.opensearch.action.ActionListener import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest import org.opensearch.action.support.ActionFilters -import org.opensearch.action.support.master.AcknowledgedResponse -import org.opensearch.action.support.master.TransportMasterNodeAction +import org.opensearch.action.support.clustermanager.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction import org.opensearch.client.Client import org.opensearch.cluster.ClusterState import org.opensearch.cluster.block.ClusterBlockException @@ -37,7 +37,7 @@ class TransportUpdateRollupMappingAction @Inject constructor( actionFilters: ActionFilters, indexNameExpressionResolver: IndexNameExpressionResolver, val client: Client -) : TransportMasterNodeAction( +) : TransportClusterManagerNodeAction( UpdateRollupMappingAction.INSTANCE.name(), transportService, clusterService, @@ -54,7 +54,7 @@ class TransportUpdateRollupMappingAction @Inject constructor( } @Suppress("ReturnCount", "LongMethod") - override fun masterOperation( + override fun clusterManagerOperation( request: UpdateRollupMappingRequest, state: ClusterState, listener: ActionListener diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingAction.kt index 4bd6a77d0..15034e1d7 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.rollup.action.mapping import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.common.io.stream.Writeable class UpdateRollupMappingAction : ActionType(NAME, reader) { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingRequest.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingRequest.kt index 7461bdb80..9c6fd785b 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingRequest.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/mapping/UpdateRollupMappingRequest.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.rollup.action.mapping import org.opensearch.action.ActionRequestValidationException -import org.opensearch.action.support.master.AcknowledgedRequest +import org.opensearch.action.support.clustermanager.AcknowledgedRequest import org.opensearch.common.io.stream.StreamInput import org.opensearch.common.io.stream.StreamOutput import org.opensearch.indexmanagement.rollup.model.Rollup diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/StartRollupAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/StartRollupAction.kt index ed22058f0..f40f96da5 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/StartRollupAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/StartRollupAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.rollup.action.start import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse class StartRollupAction private constructor() : ActionType(NAME, ::AcknowledgedResponse) { companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/TransportStartRollupAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/TransportStartRollupAction.kt index 9b0fd60dc..00338aaa3 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/TransportStartRollupAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/start/TransportStartRollupAction.kt @@ -14,7 +14,7 @@ import org.opensearch.action.get.GetRequest import org.opensearch.action.get.GetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/StopRollupAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/StopRollupAction.kt index 658f5cca9..b533969e4 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/StopRollupAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/StopRollupAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.rollup.action.stop import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse class StopRollupAction private constructor() : ActionType(NAME, ::AcknowledgedResponse) { companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/TransportStopRollupAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/TransportStopRollupAction.kt index 1acf44f5d..81f52423a 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/TransportStopRollupAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/action/stop/TransportStopRollupAction.kt @@ -14,7 +14,7 @@ import org.opensearch.action.get.GetRequest import org.opensearch.action.get.GetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/index/TransportIndexTransformAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/index/TransportIndexTransformAction.kt index 373530386..c0ae4bf97 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/index/TransportIndexTransformAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/index/TransportIndexTransformAction.kt @@ -19,7 +19,7 @@ import org.opensearch.action.index.IndexResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.action.support.IndicesOptions -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.service.ClusterService diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/StartTransformAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/StartTransformAction.kt index b38f2dc8f..82854aba9 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/StartTransformAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/StartTransformAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.transform.action.start import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse class StartTransformAction private constructor() : ActionType(NAME, ::AcknowledgedResponse) { companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/TransportStartTransformAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/TransportStartTransformAction.kt index 08e101020..1a6fdc691 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/TransportStartTransformAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/start/TransportStartTransformAction.kt @@ -14,7 +14,7 @@ import org.opensearch.action.get.GetRequest import org.opensearch.action.get.GetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformAction.kt index 500449a7c..350054588 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformAction.kt @@ -6,7 +6,7 @@ package org.opensearch.indexmanagement.transform.action.stop import org.opensearch.action.ActionType -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse class StopTransformAction private constructor() : ActionType(NAME, ::AcknowledgedResponse) { companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt index f3c803e39..991926cfb 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt @@ -14,7 +14,7 @@ import org.opensearch.action.get.GetRequest import org.opensearch.action.get.GetResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client diff --git a/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt b/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt index c075bf2b1..9eb58592b 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt @@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.util import org.apache.logging.log4j.LogManager import org.opensearch.action.ActionListener import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.IndicesAdminClient import org.opensearch.cluster.ClusterState import org.opensearch.cluster.metadata.IndexAbstraction diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt index 3874f79b3..de5cc3b11 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt @@ -9,7 +9,7 @@ import com.carrotsearch.randomizedtesting.RandomizedTest.sleep import org.junit.After import org.junit.Assume import org.junit.Before -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.cluster.metadata.IndexMetadata import org.opensearch.common.settings.Settings import org.opensearch.index.Index diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt index d5faa4e48..edbd635d8 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt @@ -12,7 +12,7 @@ import com.nhaarman.mockitokotlin2.whenever import kotlinx.coroutines.runBlocking import org.mockito.Mockito.doAnswer import org.opensearch.action.ActionListener -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.AdminClient import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt index e3248ae4d..fb6769f9e 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt @@ -12,7 +12,7 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever import kotlinx.coroutines.runBlocking import org.opensearch.action.ActionListener -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.AdminClient import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt index 4959a46d4..ee6caf78d 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt @@ -12,7 +12,7 @@ import com.nhaarman.mockitokotlin2.whenever import kotlinx.coroutines.runBlocking import org.mockito.Mockito.doAnswer import org.opensearch.action.ActionListener -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.AdminClient import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt index 8501f6d24..f3698850a 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt @@ -12,7 +12,7 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever import kotlinx.coroutines.runBlocking import org.opensearch.action.ActionListener -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.AdminClient import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt index 6c56fadb5..3411d5e33 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt @@ -12,7 +12,7 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever import kotlinx.coroutines.runBlocking import org.opensearch.action.ActionListener -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.AdminClient import org.opensearch.client.Client import org.opensearch.client.IndicesAdminClient