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

[Backport 2.x] [Refactor] for CircuitBreaker and Lifecycle #1097

Merged
merged 2 commits into from
Aug 7, 2023
Merged

[Backport 2.x] [Refactor] for CircuitBreaker and Lifecycle #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb715e
Refactor for CircuitBreaker and Lifecycle (#1096)
monusingh-1 Aug 2, 2023
f1a9d69
Refactor to core.common.Strings and MediaType
monusingh-1 Aug 7, 2023
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 src/main/kotlin/org/opensearch/index/translog/ReplicationTranslogDeletionPolicy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.opensearch.index.translog

import org.opensearch.common.unit.ByteSizeValue
import org.opensearch.core.common.unit.ByteSizeValue
import org.opensearch.index.IndexSettings
import org.opensearch.index.seqno.RetentionLease
import org.opensearch.index.seqno.RetentionLeases
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/opensearch/replication/ReplicationPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import org.opensearch.cluster.node.DiscoveryNodes
import org.opensearch.cluster.service.ClusterService
import org.opensearch.common.CheckedFunction
import org.opensearch.core.ParseField
import org.opensearch.common.component.LifecycleComponent
import org.opensearch.common.lifecycle.LifecycleComponent
import org.opensearch.core.common.io.stream.NamedWriteableRegistry
import org.opensearch.core.common.io.stream.Writeable
import org.opensearch.common.settings.ClusterSettings
Expand All @@ -92,8 +92,8 @@ import org.opensearch.common.settings.Setting
import org.opensearch.common.settings.Settings
import org.opensearch.common.settings.SettingsFilter
import org.opensearch.common.settings.SettingsModule
import org.opensearch.common.unit.ByteSizeUnit
import org.opensearch.common.unit.ByteSizeValue
import org.opensearch.core.common.unit.ByteSizeUnit
import org.opensearch.core.common.unit.ByteSizeValue
import org.opensearch.common.unit.TimeValue
import org.opensearch.common.util.concurrent.OpenSearchExecutors
import org.opensearch.core.xcontent.NamedXContentRegistry
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/ReplicationSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package org.opensearch.replication

import org.opensearch.cluster.service.ClusterService
import org.opensearch.common.settings.ClusterSettings
import org.opensearch.common.unit.ByteSizeValue
import org.opensearch.core.common.unit.ByteSizeValue
import org.opensearch.common.unit.TimeValue
import org.opensearch.commons.utils.OpenForTesting

Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/org/opensearch/replication/action/stats/FollowerStatsResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager
import org.opensearch.action.FailedNodeException
import org.opensearch.action.support.nodes.BaseNodesResponse
import org.opensearch.cluster.ClusterName
import org.opensearch.common.Strings
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS
Expand Down Expand Up @@ -117,7 +116,7 @@ class FollowerStatsResponse : BaseNodesResponse<FollowerNodeStatsResponse?>, ToX
override fun toString(): String {
val builder: XContentBuilder = XContentFactory.jsonBuilder().prettyPrint()
toXContent(builder, EMPTY_PARAMS)
return Strings.toString(builder)
return builder.toString()
}
}

3 changes: 1 addition & 2 deletions src/main/kotlin/org/opensearch/replication/action/stats/LeaderStatsResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager
import org.opensearch.action.FailedNodeException
import org.opensearch.action.support.nodes.BaseNodesResponse
import org.opensearch.cluster.ClusterName
import org.opensearch.common.Strings
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS
Expand Down Expand Up @@ -76,7 +75,7 @@ class LeaderStatsResponse : BaseNodesResponse<LeaderNodeStatsResponse?>, ToXCont
override fun toString(): String {
val builder: XContentBuilder = XContentFactory.jsonBuilder().prettyPrint()
toXContent(builder, EMPTY_PARAMS)
return Strings.toString(builder)
return builder.toString()
}
}

2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/metadata/store/ReplicationMetadataStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import org.opensearch.client.Client
import org.opensearch.cluster.health.ClusterHealthStatus
import org.opensearch.cluster.metadata.IndexMetadata
import org.opensearch.cluster.service.ClusterService
import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.settings.Settings
import org.opensearch.common.util.concurrent.ThreadContext
import org.opensearch.common.xcontent.XContentType
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/repository/RemoteClusterMultiChunkTransfer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger
import org.opensearch.action.ActionListener
import org.opensearch.client.Client
import org.opensearch.cluster.node.DiscoveryNode
import org.opensearch.common.unit.ByteSizeValue
import org.opensearch.core.common.unit.ByteSizeValue
import org.opensearch.common.util.concurrent.ThreadContext
import org.opensearch.core.index.shard.ShardId
import org.opensearch.index.store.Store
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/repository/RemoteClusterRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import org.opensearch.cluster.node.DiscoveryNode
import org.opensearch.cluster.service.ClusterService
import org.opensearch.common.Nullable
import org.opensearch.common.UUIDs
import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.metrics.CounterMetric
import org.opensearch.common.settings.Settings
import org.opensearch.index.mapper.MapperService
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/repository/RemoteClusterRestoreLeaderService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.opensearch.replication.util.performOp
import org.opensearch.OpenSearchException
import org.opensearch.action.support.single.shard.SingleShardRequest
import org.opensearch.client.node.NodeClient
import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.inject.Inject
import org.opensearch.common.inject.Singleton
import org.opensearch.common.lucene.store.InputStreamIndexInput
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/seqno/RemoteClusterStats.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package org.opensearch.replication.seqno

import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.inject.Singleton
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/seqno/RemoteClusterTranslogService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package org.opensearch.replication.seqno

import org.apache.logging.log4j.LogManager
import org.opensearch.ResourceNotFoundException
import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.inject.Singleton
import org.opensearch.index.engine.Engine
import org.opensearch.index.shard.IndexShard
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package org.opensearch.replication.task.index

import org.opensearch.Version
import org.opensearch.core.ParseField
import org.opensearch.common.Strings
import org.opensearch.core.common.Strings
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.core.xcontent.ObjectParser
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ import org.opensearch.common.logging.Loggers
import org.opensearch.common.settings.Setting
import org.opensearch.common.settings.Settings
import org.opensearch.common.settings.SettingsModule
import org.opensearch.common.unit.ByteSizeUnit
import org.opensearch.common.unit.ByteSizeValue
import org.opensearch.core.common.unit.ByteSizeUnit
import org.opensearch.core.common.unit.ByteSizeValue
import org.opensearch.core.xcontent.ToXContent
import org.opensearch.core.xcontent.ToXContentObject
import org.opensearch.core.xcontent.XContentBuilder
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/task/shard/ShardReplicationParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package org.opensearch.replication.task.shard

import org.opensearch.Version
import org.opensearch.core.ParseField
import org.opensearch.common.Strings
import org.opensearch.core.common.Strings
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.core.xcontent.ObjectParser
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/util/Injectables.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package org.opensearch.replication.util

import org.opensearch.common.component.AbstractLifecycleComponent
import org.opensearch.common.lifecycle.AbstractLifecycleComponent
import org.opensearch.common.inject.Inject
import org.opensearch.indices.IndicesService
import org.opensearch.persistent.PersistentTasksService
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/util/ValidationUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.opensearch.Version
import org.opensearch.cluster.ClusterState
import org.opensearch.cluster.metadata.IndexMetadata
import org.opensearch.cluster.metadata.MetadataCreateIndexService
import org.opensearch.common.Strings
import org.opensearch.core.common.Strings
import org.opensearch.common.ValidationException
import org.opensearch.common.settings.Settings
import org.opensearch.env.Environment
Expand Down
3 changes: 1 addition & 2 deletions src/test/kotlin/org/opensearch/replication/MultiClusterRestTestCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import org.opensearch.client.ResponseException
import org.opensearch.client.RestClient
import org.opensearch.client.RestClientBuilder
import org.opensearch.client.RestHighLevelClient
import org.opensearch.common.Strings
import org.opensearch.common.io.PathUtils
import org.opensearch.common.settings.Settings
import org.opensearch.common.unit.TimeValue
Expand Down Expand Up @@ -416,7 +415,7 @@ abstract class MultiClusterRestTestCase : OpenSearchTestCase() {
clearCommand.endObject()
if (mustClear) {
val request = Request("PUT", "/_cluster/settings")
request.setJsonEntity(Strings.toString(clearCommand))
request.setJsonEntity(clearCommand.toString())
testCluster.lowLevelClient.performRequest(request)
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.opensearch.common.settings.Settings
import org.opensearch.common.unit.TimeValue
import org.opensearch.core.xcontent.DeprecationHandler
import org.opensearch.core.xcontent.NamedXContentRegistry
import org.opensearch.common.xcontent.XContentType
import org.opensearch.core.xcontent.MediaType
import org.opensearch.test.OpenSearchTestCase.assertBusy
import org.opensearch.test.rest.OpenSearchRestTestCase
import org.junit.Assert
Expand Down Expand Up @@ -96,7 +96,7 @@ fun RestHighLevelClient.startReplication(request: StartReplicationRequest,
waitForNoInitializingShards()
}
fun getAckResponse(lowLevelResponse: Response): AcknowledgedResponse {
val xContentType = XContentType.fromMediaType(lowLevelResponse.entity.contentType.value)
val xContentType = MediaType.fromMediaType(lowLevelResponse.entity.contentType.value)
val xcp = xContentType.xContent().createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.IGNORE_DEPRECATIONS,
lowLevelResponse.entity.content)
return AcknowledgedResponse.fromXContent(xcp)
Expand Down
Loading