Apply suggestions

Author: KodaiD

core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java

@@ -1,7 +1,5 @@
 package com.scalar.db.storage.dynamo;
 
-import static com.scalar.db.util.ScalarDbUtils.getFullTableName;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -1034,26 +1032,44 @@ columnName, getFullTableName(namespace, table)),
         TableMetadata.newBuilder(tableMetadata).addSecondaryIndex(columnName).build());
   }
 
-  private boolean indexExistsInternal(String nonPrefixedNamespace, String table, String indexName) {
+  private boolean rawIndexExists(String nonPrefixedNamespace, String table, String indexName) {
     Namespace namespace = Namespace.of(namespacePrefix, nonPrefixedNamespace);
     String globalIndexName =
         String.join(
             ".",
             getFullTableName(namespace, table),
             DynamoAdmin.GLOBAL_INDEX_NAME_PREFIX,
             indexName);
-    DescribeTableResponse response =
-        client.describeTable(
-            DescribeTableRequest.builder().tableName(getFullTableName(namespace, table)).build());
-    for (GlobalSecondaryIndexDescription globalSecondaryIndex :
-        response.table().globalSecondaryIndexes()) {
-      if (globalSecondaryIndex.indexName().equals(globalIndexName)) {
-        if (globalSecondaryIndex.indexStatus() == IndexStatus.ACTIVE) {
+    int retryCount = 0;
+    try {
+      while (true) {
+        DescribeTableResponse response =
+            client.describeTable(
+                DescribeTableRequest.builder()
+                    .tableName(getFullTableName(namespace, table))
+                    .build());
+        GlobalSecondaryIndexDescription description =
+            response.table().globalSecondaryIndexes().stream()
+                .filter(d -> d.indexName().equals(globalIndexName))
+                .findFirst()
+                .orElse(null);
+        if (description == null) {
+          return false;
+        }
+        if (description.indexStatus() == IndexStatus.ACTIVE) {
           return true;
         }
+        if (retryCount++ >= MAX_RETRY_COUNT) {
+          throw new IllegalStateException(
+              String.format(
+                  "Waiting for the secondary index %s on the %s table to be active failed",
+                  indexName, getFullTableName(namespace, table)));
+        }
+        Uninterruptibles.sleepUninterruptibly(waitingDurationSecs, TimeUnit.SECONDS);
       }
+    } catch (ResourceNotFoundException e) {
+      return false;
     }
-    return false;
   }
 
   private void waitForIndexCreation(Namespace namespace, String table, String columnName)
@@ -1391,7 +1407,7 @@ public void repairTable(
     try {
       createTableInternal(nonPrefixedNamespace, table, metadata, true, options);
       for (String indexColumnName : metadata.getSecondaryIndexNames()) {
-        if (!indexExistsInternal(nonPrefixedNamespace, table, indexColumnName)) {
+        if (!rawIndexExists(nonPrefixedNamespace, table, indexColumnName)) {
           createIndex(nonPrefixedNamespace, table, indexColumnName, options);
         }
       }