Merge pull request #83 from naver/feature/add-chunk-to-find-jvm-uuid-…

…without-agent Add chunk to selectAllUuidsByWithoutAgent Reviewed by: @taeyeon-Kim
naver · Jul 12, 2023 · 01a107e · 01a107e
2 parents e2b7935 + e0d780a
commit 01a107e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/scavenger-collector/src/main/kotlin/com/navercorp/scavenger/repository/sql/JvmSql.kt b/scavenger-collector/src/main/kotlin/com/navercorp/scavenger/repository/sql/JvmSql.kt
@@ -58,15 +58,16 @@ class JvmSql : SqlGeneratorSupport() {
 
     fun selectAllUuidsByWithoutAgent(): String =
         """
-           SELECT uuid FROM
-                jvms
-           WHERE
-                customerId = :customerId
-                AND uuid NOT IN (
-                    SELECT
-                        jvmUuid
-                    FROM
-                        agent_state
-                )
+        SELECT uuid FROM
+             jvms
+        WHERE
+             customerId = :customerId
+             AND uuid NOT IN (
+                 SELECT
+                     jvmUuid
+                 FROM
+                     agent_state
+             )
+        LIMIT 10000
         """.trimIndent()
 }
diff --git a/scavenger-collector/src/main/kotlin/com/navercorp/scavenger/service/GarbageCollectService.kt b/scavenger-collector/src/main/kotlin/com/navercorp/scavenger/service/GarbageCollectService.kt
@@ -101,13 +101,18 @@ class GarbageCollectService(
                     customerId,
                     baseDateTime.minusMillis(intervalService.batchSweepMarginMilliSecond)
                 )
-                val uuidsWithoutAgent = jvmDao.findAllUuidsByWithoutAgent(customerId)
 
-                jvmDao.deleteAllByCustomerIdAndUuids(customerId, agentStates.map { it.jvmUuid } + uuidsWithoutAgent)
+                jvmDao.deleteAllByCustomerIdAndUuids(customerId, agentStates.map { it.jvmUuid })
                     .also { logger.info { "[$customerId] $it jvm is swiped. " } }
                 agentStateDao.deleteAllByCustomerIdAndIds(customerId, agentStates.map { it.id })
                     .also { logger.info { "[$customerId] $it agent state is swiped. " } }
             } while (agentStates.isNotEmpty())
+
+            do {
+                val uuidsWithoutAgent = jvmDao.findAllUuidsByWithoutAgent(customerId)
+                jvmDao.deleteAllByCustomerIdAndUuids(customerId, uuidsWithoutAgent)
+                    .also { logger.info { "[$customerId] $it jvm without agent is swiped." } }
+            } while (uuidsWithoutAgent.isNotEmpty())
         } catch (e: Exception) {
             logger.warn(e) { "[$customerId] error occurred while sweepAgentStates, but ignored. " }
         }