Skip to content

Commit

Permalink
feat: 历史数据刷新调整 TencentBlueKing#1748
Browse files Browse the repository at this point in the history
* feat: 删除多以的依赖 TencentBlueKing#1748

* feat: 历史数据刷新调整 TencentBlueKing#1748

* feat: 打印调整 TencentBlueKing#1748
  • Loading branch information
zacYL authored Feb 18, 2024
1 parent 8c89ae3 commit 1f0f168
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import com.tencent.bkrepo.helm.utils.TimeFormatUtil
import com.tencent.bkrepo.repository.api.MetadataClient
import com.tencent.bkrepo.repository.api.NodeClient
import com.tencent.bkrepo.repository.api.PackageClient
import com.tencent.bkrepo.repository.api.PackageMetadataClient
import com.tencent.bkrepo.repository.api.ProxyChannelClient
import com.tencent.bkrepo.repository.api.RepositoryClient
import com.tencent.bkrepo.repository.pojo.node.NodeDetail
Expand Down Expand Up @@ -123,6 +124,9 @@ open class AbstractChartService : ArtifactService() {
@Autowired
lateinit var metadataClient: MetadataClient

@Autowired
lateinit var packageMetadataClient: PackageMetadataClient

@Autowired
lateinit var repositoryClient: RepositoryClient

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.tencent.bkrepo.common.artifact.constant.ARTIFACT_INFO_KEY
import com.tencent.bkrepo.common.artifact.pojo.RepositoryCategory
import com.tencent.bkrepo.common.artifact.repository.context.ArtifactQueryContext
import com.tencent.bkrepo.common.artifact.stream.Range
import com.tencent.bkrepo.common.artifact.util.PackageKeys
import com.tencent.bkrepo.common.query.enums.OperationType
import com.tencent.bkrepo.common.query.model.PageLimit
import com.tencent.bkrepo.common.query.model.QueryModel
Expand All @@ -54,8 +55,7 @@ import com.tencent.bkrepo.helm.constants.CHART_PACKAGE_FILE_EXTENSION
import com.tencent.bkrepo.helm.constants.FULL_PATH
import com.tencent.bkrepo.helm.constants.HelmMessageCode
import com.tencent.bkrepo.helm.constants.NODE_FULL_PATH
import com.tencent.bkrepo.helm.constants.SIZE
import com.tencent.bkrepo.helm.constants.SLEEP_MILLIS
import com.tencent.bkrepo.helm.constants.NODE_METADATA
import com.tencent.bkrepo.helm.exception.HelmBadRequestException
import com.tencent.bkrepo.helm.exception.HelmFileNotFoundException
import com.tencent.bkrepo.helm.pojo.artifact.HelmArtifactInfo
Expand All @@ -70,6 +70,7 @@ import com.tencent.bkrepo.helm.utils.HelmMetadataUtils
import com.tencent.bkrepo.helm.utils.HelmUtils
import com.tencent.bkrepo.helm.utils.TimeFormatUtil
import com.tencent.bkrepo.repository.pojo.metadata.MetadataSaveRequest
import com.tencent.bkrepo.repository.pojo.metadata.packages.PackageMetadataSaveRequest
import com.tencent.bkrepo.repository.pojo.node.NodeInfo
import com.tencent.bkrepo.repository.pojo.packages.request.PopulatedPackageVersion
import com.tencent.bkrepo.repository.pojo.repo.RepositoryDetail
Expand Down Expand Up @@ -414,21 +415,24 @@ class FixToolServiceImpl(
", size [${nodeList.size}] "
)
val context = ArtifactQueryContext()
nodeList.forEach {
Thread.sleep(SLEEP_MILLIS)
for (it in nodeList) {
try {
val path = it[NODE_FULL_PATH] as String
val nodeMetadata = it[NODE_METADATA] as Map<String, Any>
if (nodeMetadata.size > 3) {
continue
}
val chartMetadata = queryHelmChartMetadata(context, path)
val metadata = HelmMetadataUtils.convertToMetadata(chartMetadata)
context.putAttribute(FULL_PATH, path)
createVersion(
userId = context.userId,
val packageMetadataRequest = PackageMetadataSaveRequest(
projectId = artifactInfo.projectId,
repoName = artifactInfo.repoName,
chartInfo = chartMetadata,
size = context.getLongAttribute(SIZE)!!,
isOverwrite = true
packageKey = PackageKeys.ofHelm(chartMetadata.name),
version = chartMetadata.version,
versionMetadata = metadata
)
packageMetadataClient.saveMetadata(packageMetadataRequest)
val metadataSaveRequest = MetadataSaveRequest(
projectId = artifactInfo.projectId,
repoName = artifactInfo.repoName,
Expand All @@ -438,7 +442,7 @@ class FixToolServiceImpl(
)
metadataClient.saveMetadata(metadataSaveRequest)
} catch (e: Exception) {
logger.error("error occurred while updating meta data, error: ${e.message}")
logger.warn("error occurred while updating metadata of $it, error: ${e.message}")
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/backend/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ includeAll(":composer")
includeAll(":generic")
includeAll(":helm")
includeAll(":maven")
includeAll(":monitor")
includeAll(":npm")
includeAll(":npm-registry")
includeAll(":nuget")
includeAll(":opdata")
includeAll(":pypi")
Expand Down

0 comments on commit 1f0f168

Please sign in to comment.