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

Handling exception in getAssignment method #881

Merged
merged 2 commits into from
May 31, 2023
Merged

Handling exception in getAssignment method #881

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf4de9
Handling exception in getAssignment method
nisgoel-amazon May 23, 2023
e6a1398
Adding UT for getAssignment Method
nisgoel-amazon May 30, 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
11 changes: 8 additions & 3 deletions src/main/kotlin/org/opensearch/replication/task/shard/ShardReplicationExecutor.kt
View file
Open in desktop
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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing, will _stop API clear these entries when the shards are not active?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this we are taking another issue
#903

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
}
}
Copy link
Member

@saikaranam-amazon saikaranam-amazon May 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add UTs for the assignment logic and can we validate the changes required for Index Replication task as well? (if any)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Index Replication task does not attach to particular node, so there assignment can happen on any node.
Those tasks are working fine

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UT has been added


override fun nodeOperation(task: AllocatedPersistentTask, params: ShardReplicationParams, state: PersistentTaskState?) {
Expand Down