correcting OpenSearchRejectedExecutionException import

Signed-off-by: sricharanvuppu <[email protected]>
opensearch-project · Jun 28, 2023 · b086a7e · b086a7e
1 parent f0b9fea
commit b086a7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/main/kotlin/org/opensearch/replication/task/shard/TranslogSequencer.kt b/src/main/kotlin/org/opensearch/replication/task/shard/TranslogSequencer.kt
@@ -126,13 +126,6 @@ class TranslogSequencer(scope: CoroutineScope, private val replicationMetadata:
                     } finally {
                         rateLimiter.release()
                     }
-<<<<<<< HEAD
-
-                    val tookInNanos = System.nanoTime() - relativeStartNanos
-                    followerClusterStats.stats[followerShardId]!!.totalWriteTime.addAndGet(TimeUnit.NANOSECONDS.toMillis(tookInNanos))
-                    followerClusterStats.stats[followerShardId]!!.opsWritten.addAndGet(replayRequest.changes.size.toLong())
-=======
->>>>>>> 448e7a7 (Handling OpenSearchRejectExecuteException Exception (#1004))
                 }
                 highWatermark = next.changes.lastOrNull()?.seqNo() ?: highWatermark
             }

diff --git a/src/main/kotlin/org/opensearch/replication/util/Extensions.kt b/src/main/kotlin/org/opensearch/replication/util/Extensions.kt
@@ -125,13 +125,13 @@ suspend fun <Req: ActionRequest, Resp: ActionResponse> Client.suspendExecuteWith
                             // This waits for the dependencies to load and retry. Helps during boot-up
                             || e.status().status >= 500
                             || e.status() == RestStatus.TOO_MANY_REQUESTS)) {
-                retryException = e;
+                retryException = e
             } else {
                 throw e
             }
         } catch (e: OpenSearchRejectedExecutionException) {
             if(index < numberOfRetries-2) {
-                retryException = e;
+                retryException = e
             }
             else {
                 throw ReplicationException(e, RestStatus.TOO_MANY_REQUESTS)