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

Add chunk to selectAllUuidsByWithoutAgent #83

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Add chunk to selectAllUuidsByWithoutAgent #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions scavenger-collector/src/main/kotlin/com/navercorp/scavenger/repository/sql/JvmSql.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
9 changes: 7 additions & 2 deletions scavenger-collector/src/main/kotlin/com/navercorp/scavenger/service/GarbageCollectService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. " }
}
Expand Down