Sonarqube fixes from subshard work coordination (#1151)

* sonarqube fixes from subshard work coordination * switch to sneaky throw for setupShardWorkItems Signed-off-by: Mikayla Thompson <[email protected]>
opensearch-project · Nov 20, 2024 · 1db3785 · 1db3785
1 parent 55a391f
commit 1db3785
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...n/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java b/...n/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java
@@ -161,13 +161,15 @@ private static void retryWithExponentialBackoff(
                 Exception underlyingException = (Exception) e.getCause();
                 exceptionConsumer.accept(underlyingException);
                 throw new IllegalStateException(underlyingException);
+            } catch (InterruptedException e) {
+                throw e;
             } catch (Exception e) {
                 attempt++;
                 if (attempt > maxRetries) {
                     exceptionConsumer.accept(e);
                     throw new RetriesExceededException(e, attempt);
                 }
-                Duration sleepDuration = Duration.ofMillis((long) (Math.pow(2.0, attempt - 1) * baseRetryTimeMs));
+                Duration sleepDuration = Duration.ofMillis((long) (Math.pow(2.0, attempt - 1.0) * baseRetryTimeMs));
                 log.atWarn().setCause(e)
                         .setMessage("Couldn't complete action due to exception. Backing off {} and trying again.")
                         .addArgument(sleepDuration).log();

diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/ShardWorkPreparer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/ShardWorkPreparer.java
@@ -59,6 +59,9 @@ private void setupShardWorkItems(
                     Duration.ofMinutes(5),
                     context::createWorkAcquisitionContext
                 );
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw Lombok.sneakyThrow(e);
             } catch (Exception e) {
                 throw Lombok.sneakyThrow(e);
             }