feat: blockNode抽取至公共模块 #2413

* feat: blockNode抽取至公共模块 #2413 * feat: blockNode抽取至公共模块 #2413 * feat: blockNode抽取至公共模块 #2413 * feat: blockNode抽取至公共模块 #2413
TencentBlueKing · Aug 16, 2024 · 57d9224 · 57d9224
1 parent 87ea527
commit 57d9224
Show file tree

Hide file tree

Showing 70 changed files with 1,139 additions and 597 deletions.
diff --git a/src/backend/boot-assembly/src/main/kotlin/com/tencent/bkrepo/config/FsNodeDefaultImpl.kt b/src/backend/boot-assembly/src/main/kotlin/com/tencent/bkrepo/config/FsNodeDefaultImpl.kt
diff --git a/...on/mongo/reactive/dao/ShardingDocument.kt → ...repo/common/api/mongo/ShardingDocument.kt b/...on/mongo/reactive/dao/ShardingDocument.kt → ...repo/common/api/mongo/ShardingDocument.kt
@@ -29,7 +29,7 @@
  * SOFTWARE.
  */
 
-package com.tencent.bkrepo.common.mongo.reactive.dao
+package com.tencent.bkrepo.common.api.mongo
 
 /**
  * 分表Document

diff --git a/.../common/mongo/dao/sharding/ShardingKey.kt → ...nt/bkrepo/common/api/mongo/ShardingKey.kt b/.../common/mongo/dao/sharding/ShardingKey.kt → ...nt/bkrepo/common/api/mongo/ShardingKey.kt
@@ -29,7 +29,7 @@
  * SOFTWARE.
  */
 
-package com.tencent.bkrepo.common.mongo.dao.sharding
+package com.tencent.bkrepo.common.api.mongo
 
 /**
  * 分表字段

diff --git a/src/backend/common/common-artifact/artifact-service/build.gradle.kts b/src/backend/common/common-artifact/artifact-service/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
     api(project(":common:common-operate:operate-service"))
     api(project(":common:common-stream"))
     api(project(":common:common-metrics-push"))
+    api(project(":common:common-metadata:metadata-service"))
 
     api("org.springframework.boot:spring-boot-starter-aop")
     api("io.micrometer:micrometer-registry-prometheus")

diff --git a/...ice/src/main/kotlin/com/tencent/bkrepo/common/artifact/manager/NodeResourceFactoryImpl.kt b/...ice/src/main/kotlin/com/tencent/bkrepo/common/artifact/manager/NodeResourceFactoryImpl.kt
@@ -36,11 +36,11 @@ import com.tencent.bkrepo.common.artifact.manager.resource.LocalNodeResource
 import com.tencent.bkrepo.common.artifact.manager.resource.NodeResource
 import com.tencent.bkrepo.common.artifact.manager.resource.RemoteNodeResource
 import com.tencent.bkrepo.common.artifact.stream.Range
+import com.tencent.bkrepo.common.metadata.service.blocknode.BlockNodeService
 import com.tencent.bkrepo.common.service.cluster.ClusterInfo
 import com.tencent.bkrepo.common.service.cluster.properties.ClusterProperties
 import com.tencent.bkrepo.common.storage.core.StorageService
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
-import com.tencent.bkrepo.fs.server.api.FsNodeClient
 import com.tencent.bkrepo.fs.server.constant.FS_ATTR_KEY
 import com.tencent.bkrepo.replication.api.ClusterNodeClient
 import com.tencent.bkrepo.replication.exception.ReplicationMessageCode
@@ -51,7 +51,7 @@ class NodeResourceFactoryImpl(
     private val clusterProperties: ClusterProperties,
     private val storageService: StorageService,
     private val storageCredentialsClient: StorageCredentialsClient,
-    private val fsNodeClient: FsNodeClient,
+    private val blockNodeService: BlockNodeService,
     private val clusterNodeClient: ClusterNodeClient,
     private val archiveClient: ArchiveClient,
 ) : NodeResourceFactory {
@@ -71,7 +71,7 @@ class NodeResourceFactoryImpl(
     ): NodeResource {
         val digest = nodeInfo.sha256.orEmpty()
         if (isFsFile(nodeInfo)) {
-            return FsNodeResource(nodeInfo, fsNodeClient, range, storageService, storageCredentials)
+            return FsNodeResource(nodeInfo, blockNodeService, range, storageService, storageCredentials)
         }
         if (clusterProperties.role == ClusterNodeType.EDGE &&
             clusterProperties.architecture != ClusterArchitecture.COMMIT_EDGE) {

diff --git a/...ice/src/main/kotlin/com/tencent/bkrepo/common/artifact/manager/resource/FsNodeResource.kt b/...ice/src/main/kotlin/com/tencent/bkrepo/common/artifact/manager/resource/FsNodeResource.kt
@@ -29,30 +29,28 @@ package com.tencent.bkrepo.common.artifact.manager.resource
 
 import com.tencent.bkrepo.common.artifact.stream.ArtifactInputStream
 import com.tencent.bkrepo.common.artifact.stream.Range
+import com.tencent.bkrepo.common.metadata.service.blocknode.BlockNodeService
 import com.tencent.bkrepo.common.storage.core.StorageService
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
-import com.tencent.bkrepo.fs.server.api.FsNodeClient
+import com.tencent.bkrepo.repository.pojo.node.NodeDetail
 import com.tencent.bkrepo.repository.pojo.node.NodeInfo
 
 /**
  * 文件节点
  * */
 class FsNodeResource(
     private val node: NodeInfo,
-    private val fsNodeClient: FsNodeClient,
+    private val blockNodeService: BlockNodeService,
     private val range: Range,
     private val storageService: StorageService,
     private val storageCredentials: StorageCredentials?
 ) : AbstractNodeResource() {
     override fun getArtifactInputStream(): ArtifactInputStream? {
         with(node) {
-            val blocks = fsNodeClient.listBlockResources(
-                projectId = projectId,
-                repoName = repoName,
-                path = fullPath,
-                startPos = range.start,
-                endPos = range.end
-            ).data ?: emptyList()
+            val blocks = blockNodeService.info(
+                nodeDetail = NodeDetail(this),
+                range = range
+            )
             return storageService.load(blocks, range, storageCredentials)
         }
     }

diff --git a/...on/mongo/dao/sharding/ShardingDocument.kt → ...d/common/common-metadata/build.gradle.kts b/...on/mongo/dao/sharding/ShardingDocument.kt → ...d/common/common-metadata/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
  *
- * Copyright (C) 2020 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
  *
  * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
  *
@@ -28,17 +28,3 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
-package com.tencent.bkrepo.common.mongo.dao.sharding
-
-/**
- * 分表Document
- */
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.CLASS)
-annotation class ShardingDocument(
-    /**
-     * collection name
-     */
-    val collection: String = ""
-)
diff --git a/.../common/mongo/reactive/dao/ShardingKey.kt → ...on-metadata/metadata-api/build.gradle.kts b/.../common/mongo/reactive/dao/ShardingKey.kt → ...on-metadata/metadata-api/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
  *
- * Copyright (C) 2020 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
  *
  * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
  *
@@ -28,21 +28,3 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
-package com.tencent.bkrepo.common.mongo.reactive.dao
-
-/**
- * 分表字段
- */
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.FIELD)
-annotation class ShardingKey(
-    /**
-     * 分表字段
-     */
-    val column: String = "",
-    /**
-     * 分表数，power of 2
-     */
-    val count: Int = 1
-)
diff --git a/...data/metadata-api/src/main/kotlin/com/tencent/bkrepo/common/metadata/constant/Constant.kt b/...data/metadata-api/src/main/kotlin/com/tencent/bkrepo/common/metadata/constant/Constant.kt
@@ -0,0 +1,34 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.bkrepo.common.metadata.constant
+
+const val SHARDING_COUNT = 256
+const val ID = "_id"
+
+const val FAKE_SHA256 = "0000000000000000000000000000000000000000000000000000000000000000"
+const val FAKE_MD5 = "00000000000000000000000000000000"
diff --git a/src/backend/common/common-metadata/metadata-service/build.gradle.kts b/src/backend/common/common-metadata/metadata-service/build.gradle.kts
@@ -0,0 +1,40 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+dependencies {
+    api(project(":common:common-artifact:artifact-api"))
+    api(project(":common:common-metadata:metadata-api"))
+    api(project(":common:common-storage:storage-api"))
+    api(project(":repository:api-repository"))
+
+    compileOnly(project(":common:common-mongo-reactive"))
+    compileOnly(project(":common:common-mongo"))
+}
diff --git a/...a-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/MetadataAutoConfiguration.kt b/...a-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/MetadataAutoConfiguration.kt
@@ -0,0 +1,37 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.bkrepo.common.metadata
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@ConditionalOnWebApplication
+@ComponentScan(basePackages = ["com.tencent.bkrepo.common.metadata"])
+class MetadataAutoConfiguration
diff --git a/...service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/ReactiveCondition.kt b/...service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/ReactiveCondition.kt
@@ -0,0 +1,43 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.bkrepo.common.metadata.condition
+
+import org.springframework.context.annotation.Condition
+import org.springframework.context.annotation.ConditionContext
+import org.springframework.core.type.AnnotatedTypeMetadata
+
+class ReactiveCondition : Condition {
+    override fun matches(context: ConditionContext, metadata: AnnotatedTypeMetadata): Boolean {
+        try {
+            context.classLoader?.loadClass("com.mongodb.reactivestreams.client.MongoClient")
+            return true
+        } catch (e: ClassNotFoundException) {
+            return false
+        }
+    }
+}