Skip to content

Commit

Permalink
Handling exception in getAssignment method (#937)
Browse files Browse the repository at this point in the history
* Handling exception in getAssignment method (#881)

* Handling exception in getAssignment method

Handling exception in getAssignment method

Signed-off-by: Nishant Goel <[email protected]>

Signed-off-by: Nishant Goel <[email protected]>

* Adding UT for getAssignment Method

Signed-off-by: Nishant Goel <[email protected]>

---------

Signed-off-by: Nishant Goel <[email protected]>
Signed-off-by: Nishant Goel <[email protected]>
(cherry picked from commit 14b9268)

* Fixing build

Signed-off-by: Nishant Goel <[email protected]>

---------

Signed-off-by: Nishant Goel <[email protected]>
(cherry picked from commit 2c28901)
  • Loading branch information
nisgoel-amazon authored and github-actions[bot] committed Jun 1, 2023
1 parent af0605d commit 1a29ffe
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,14 @@ class ShardReplicationExecutor(executor: String, private val clusterService : Cl
}

override fun getAssignment(params: ShardReplicationParams, clusterState: ClusterState) : Assignment {
val primaryShard = clusterState.routingTable().shardRoutingTable(params.followerShardId).primaryShard()
if (!primaryShard.active()) return SHARD_NOT_ACTIVE
return Assignment(primaryShard.currentNodeId(), "node with primary shard")
try {
val primaryShard = clusterState.routingTable().shardRoutingTable(params.followerShardId).primaryShard()
if (!primaryShard.active()) return SHARD_NOT_ACTIVE
return Assignment(primaryShard.currentNodeId(), "node with primary shard")
} catch (e: Exception) {
log.error("Failed to assign shard replication task with id ${params.followerShardId}", e)
return SHARD_NOT_ACTIVE
}
}

override fun nodeOperation(task: AllocatedPersistentTask, params: ShardReplicationParams, state: PersistentTaskState?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
package org.opensearch.replication.task.shard

import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope
import org.junit.Assert
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito
import org.opensearch.Version
import org.opensearch.cluster.ClusterState
import org.opensearch.cluster.metadata.IndexMetadata
import org.opensearch.cluster.metadata.Metadata
import org.opensearch.cluster.routing.*
import org.opensearch.common.unit.TimeValue
import org.opensearch.common.xcontent.NamedXContentRegistry
import org.opensearch.index.Index
import org.opensearch.index.shard.ShardId
import org.opensearch.replication.ReplicationSettings
import org.opensearch.replication.metadata.ReplicationMetadataManager
import org.opensearch.replication.metadata.store.ReplicationMetadataStore
import org.opensearch.replication.task.index.*
import org.opensearch.test.ClusterServiceUtils
import org.opensearch.test.OpenSearchTestCase
import org.opensearch.threadpool.TestThreadPool
import java.util.ArrayList
import java.util.concurrent.TimeUnit

@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
class ShardReplicationExecutorTests: OpenSearchTestCase() {

companion object {
var followerIndex = "follower-index"
var remoteCluster = "remote-cluster"
}

private lateinit var shardReplicationExecutor: ShardReplicationExecutor

private var threadPool = TestThreadPool("ShardExecutorTest")
private var clusterService = ClusterServiceUtils.createClusterService(threadPool)

@Before
fun setup() {
val spyClient = Mockito.spy(NoOpClient("testName"))
val replicationMetadataManager = ReplicationMetadataManager(clusterService, spyClient,
ReplicationMetadataStore(spyClient, clusterService, NamedXContentRegistry.EMPTY)
)
val followerStats = FollowerClusterStats()
val followerShardId = ShardId("follower", "follower_uuid", 0)
followerStats.stats[followerShardId] = FollowerShardMetric()

val replicationSettings = Mockito.mock(ReplicationSettings::class.java)
replicationSettings.metadataSyncInterval = TimeValue(100, TimeUnit.MILLISECONDS)
shardReplicationExecutor = ShardReplicationExecutor(
"test_executor",
clusterService,
threadPool,
spyClient,
replicationMetadataManager,
replicationSettings,
followerStats
)
}

@Test
fun `getAssignment should not throw exception when no shard is present` () {
val sId = ShardId(Index(followerIndex, "_na_"), 0)
val params = ShardReplicationParams(remoteCluster, sId, sId)
val clusterState = createClusterState(null, null)

try {
val assignment = shardReplicationExecutor.getAssignment(params, clusterState)
Assert.assertEquals(null, assignment.executorNode)
} catch (e: Exception) {
// Validation should not throw an exception, so the test should fail if it reaches this line
Assert.fail("Expected Exception should not be thrown")
}
}

@Test
fun `getAssignment should return null if shard is present but is not active` () {
val sId = ShardId(Index(followerIndex, "_na_"), 0)
val params = ShardReplicationParams(remoteCluster, sId, sId)
val unassignedShard = ShardRouting.newUnassigned(
sId,
true,
RecoverySource.EmptyStoreRecoverySource.INSTANCE,
UnassignedInfo(UnassignedInfo.Reason.INDEX_CREATED, null)
)
val clusterState = createClusterState(sId, unassignedShard)

try {
val assignment = shardReplicationExecutor.getAssignment(params, clusterState)
Assert.assertEquals(null, assignment.executorNode)
} catch (e: Exception) {
// Validation should not throw an exception, so the test should fail if it reaches this line
Assert.fail("Expected Exception should not be thrown")
}
}

@Test
fun `getAssignment should return node when shard is present` () {
val sId = ShardId(Index(followerIndex, "_na_"), 0)
val params = ShardReplicationParams(remoteCluster, sId, sId)
val initializingShard = TestShardRouting.newShardRouting(
followerIndex,
sId.id,
"1",
true,
ShardRoutingState.INITIALIZING
)
val startedShard = initializingShard.moveToStarted()
val clusterState = createClusterState(sId, startedShard)

try {
val assignment = shardReplicationExecutor.getAssignment(params, clusterState)
Assert.assertEquals(initializingShard.currentNodeId(), assignment.executorNode)
} catch (e: Exception) {
// Validation should not throw an exception, so the test should fail if it reaches this line
Assert.fail("Expected Exception should not be thrown")
}
}

private fun createClusterState(shardId: ShardId?, shardRouting: ShardRouting?): ClusterState {
val indices: MutableList<String> = ArrayList()
indices.add(followerIndex)
val metadata = Metadata.builder()
.put(
IndexMetadata.builder(ReplicationMetadataStore.REPLICATION_CONFIG_SYSTEM_INDEX).settings(settings(
Version.CURRENT)).numberOfShards(1).numberOfReplicas(0))
.put(
IndexMetadata.builder(IndexReplicationTaskTests.followerIndex).settings(settings(
Version.CURRENT)).numberOfShards(2).numberOfReplicas(0))
.build()

val routingTableBuilder = RoutingTable.builder()
.addAsNew(metadata.index(ReplicationMetadataStore.REPLICATION_CONFIG_SYSTEM_INDEX))
.addAsNew(metadata.index(followerIndex))

if (shardId != null) {
routingTableBuilder.add(
IndexRoutingTable.builder(shardId.index)
.addShard(shardRouting)
.build()
)
}

return ClusterState.builder(clusterService.state()).routingTable(routingTableBuilder.build()).build()
}
}

0 comments on commit 1a29ffe

Please sign in to comment.