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

fix: 修复过期节点删除任务导致统计数据不准的问题 #1486

Merged
merged 1 commit into from
Nov 25, 2023
Merged

fix: 修复过期节点删除任务导致统计数据不准的问题 #1486

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
28 changes: 17 additions & 11 deletions src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/ExpiredNodeMarkupJob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@

package com.tencent.bkrepo.job.batch

import com.tencent.bkrepo.common.mongo.constant.ID
import com.tencent.bkrepo.job.SHARDING_COUNT
import com.tencent.bkrepo.job.batch.base.DefaultContextMongoDbJob
import com.tencent.bkrepo.job.batch.base.JobContext
import com.tencent.bkrepo.job.batch.utils.TimeUtils
import com.tencent.bkrepo.job.config.properties.ExpiredNodeMarkupJobProperties
import com.tencent.bkrepo.repository.api.NodeClient
import com.tencent.bkrepo.repository.constant.SYSTEM_USER
import com.tencent.bkrepo.repository.pojo.node.service.NodeDeleteRequest
import org.slf4j.LoggerFactory
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
import org.springframework.data.mongodb.core.query.Update
import org.springframework.data.mongodb.core.query.and
import org.springframework.data.mongodb.core.query.isEqualTo
import org.springframework.data.mongodb.core.query.where
Expand All @@ -51,10 +52,13 @@ import java.time.LocalDateTime
@EnableConfigurationProperties(ExpiredNodeMarkupJobProperties::class)
class ExpiredNodeMarkupJob(
properties: ExpiredNodeMarkupJobProperties,
private val nodeClient: NodeClient
) : DefaultContextMongoDbJob<ExpiredNodeMarkupJob.Node>(properties) {

data class Node(
val id: String,
val projectId: String,
val repoName: String,
val fullPath: String,
val expireDate: LocalDateTime,
val deleted: LocalDateTime?
)
Expand All @@ -78,7 +82,9 @@ class ExpiredNodeMarkupJob(

override fun mapToEntity(row: Map<String, Any?>): Node {
return Node(
row[ID].toString(),
row[Node::projectId.name].toString(),
row[Node::repoName.name].toString(),
row[Node::fullPath.name].toString(),
TimeUtils.parseMongoDateTimeStr(row[Node::expireDate.name].toString())!!,
TimeUtils.parseMongoDateTimeStr(row[Node::deleted.name].toString())
)
Expand All @@ -89,15 +95,15 @@ class ExpiredNodeMarkupJob(
}

override fun run(row: Node, collectionName: String, context: JobContext) {
val query = Query.query(Criteria.where(ID).isEqualTo(row.id))
mongoTemplate.updateFirst(
query,
Update().set(Node::deleted.name, LocalDateTime.now()),
collectionName
)
try {
nodeClient.deleteNode(NodeDeleteRequest(row.projectId, row.repoName, row.fullPath, SYSTEM_USER))
} catch (e: Exception) {
logger.warn("delete expired node[$row] failed: $e")
}
}

companion object {
private const val COLLECTION_NAME_PREFIX = "node_"
private val logger = LoggerFactory.getLogger(ExpiredNodeMarkupJob::class.java)
}
}