Skip to content
代码片段 群组 项目
未验证 提交 1ff016ab 编辑于 作者: Michael Kozono's avatar Michael Kozono 提交者: GitLab
浏览文件

Merge branch 'gitlab_main_cell_local' into 'master'

Create new gitlab_main_cell_local and gitlab_ci_cell_local schemas

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180139



Merged-by: default avatarMichael Kozono <mkozono@gitlab.com>
Approved-by: default avatarMichael Kozono <mkozono@gitlab.com>
Approved-by: default avatarKrasimir Angelov <kangelov@gitlab.com>
Reviewed-by: default avatarMichael Kozono <mkozono@gitlab.com>
Reviewed-by: default avatarKrasimir Angelov <kangelov@gitlab.com>
Co-authored-by: default avatarThong Kuah <tkuah@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
显示
22 个添加33 个删除
...@@ -4,10 +4,12 @@ gitlab_schemas: ...@@ -4,10 +4,12 @@ gitlab_schemas:
- gitlab_internal - gitlab_internal
- gitlab_shared - gitlab_shared
- gitlab_ci - gitlab_ci
- gitlab_ci_cell_local
lock_gitlab_schemas: lock_gitlab_schemas:
- gitlab_main - gitlab_main
- gitlab_main_clusterwide - gitlab_main_clusterwide
- gitlab_main_cell - gitlab_main_cell
- gitlab_main_cell_local
- gitlab_pm - gitlab_pm
- gitlab_sec - gitlab_sec
klass: Ci::ApplicationRecord klass: Ci::ApplicationRecord
......
...@@ -5,10 +5,12 @@ gitlab_schemas: ...@@ -5,10 +5,12 @@ gitlab_schemas:
- gitlab_shared - gitlab_shared
- gitlab_main - gitlab_main
- gitlab_main_cell - gitlab_main_cell
- gitlab_main_cell_local
- gitlab_pm - gitlab_pm
- gitlab_main_clusterwide - gitlab_main_clusterwide
lock_gitlab_schemas: lock_gitlab_schemas:
- gitlab_ci - gitlab_ci
- gitlab_ci_cell_local
- gitlab_sec - gitlab_sec
# Note that we use ActiveRecord::Base here and not ApplicationRecord. # Note that we use ActiveRecord::Base here and not ApplicationRecord.
# This is deliberate, as: # This is deliberate, as:
......
...@@ -8,7 +8,9 @@ lock_gitlab_schemas: ...@@ -8,7 +8,9 @@ lock_gitlab_schemas:
- gitlab_main - gitlab_main
- gitlab_main_clusterwide - gitlab_main_clusterwide
- gitlab_main_cell - gitlab_main_cell
- gitlab_main_cell_local
- gitlab_ci - gitlab_ci
- gitlab_ci_cell_local
- gitlab_pm - gitlab_pm
klass: Gitlab::Database::SecApplicationRecord klass: Gitlab::Database::SecApplicationRecord
# if Sec database is not configured, use this database # if Sec database is not configured, use this database
......
...@@ -7,7 +7,6 @@ feature_categories: ...@@ -7,7 +7,6 @@ feature_categories:
description: Contains periodically snapshotted database record counts. description: Contains periodically snapshotted database record counts.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62797 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62797
milestone: '14.0' milestone: '14.0'
gitlab_schema: gitlab_main_cell gitlab_schema: gitlab_main_cell_local
exempt_from_sharding: true
notes: Exempted because Cell local table storing instance level-aggregations notes: Exempted because Cell local table storing instance level-aggregations
table_size: small table_size: small
...@@ -7,7 +7,6 @@ feature_categories: ...@@ -7,7 +7,6 @@ feature_categories:
description: Approvers of given merge request description: Approvers of given merge request
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3cc78d89984d9c9df8372c52b7bba38e6226f9f2 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3cc78d89984d9c9df8372c52b7bba38e6226f9f2
milestone: '7.13' milestone: '7.13'
gitlab_schema: gitlab_main_cell gitlab_schema: gitlab_main_cell_local
exempt_from_sharding: true
notes: Exempted because Marked for drop - https://gitlab.com/gitlab-org/gitlab/-/issues/444234 notes: Exempted because Marked for drop - https://gitlab.com/gitlab-org/gitlab/-/issues/444234
table_size: small table_size: small
...@@ -8,7 +8,6 @@ description: A set of cost factors per runner which are applied to ci job durati ...@@ -8,7 +8,6 @@ description: A set of cost factors per runner which are applied to ci job durati
based on project type. based on project type.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111977 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111977
milestone: '15.10' milestone: '15.10'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
notes: Exempted because Cell-local table storing cost information for instance runners notes: Exempted because Cell-local table storing cost information for instance runners
table_size: small table_size: small
...@@ -3,10 +3,9 @@ table_name: ci_hosted_runners ...@@ -3,10 +3,9 @@ table_name: ci_hosted_runners
classes: classes:
- Ci::HostedRunner - Ci::HostedRunner
feature_categories: feature_categories:
- hosted_runners - hosted_runners
description: Stores dedicated hosted runners, which are instance level runners managed by GitLab description: Stores dedicated hosted runners, which are instance level runners managed by GitLab
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181447 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181447
milestone: '17.10' milestone: '17.10'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
table_size: small table_size: small
exempt_from_sharding: true # dedicated only
...@@ -7,7 +7,6 @@ feature_categories: ...@@ -7,7 +7,6 @@ feature_categories:
description: CI/CD variables available to all projects and groups in an instance. description: CI/CD variables available to all projects and groups in an instance.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30156 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30156
milestone: '13.0' milestone: '13.0'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
notes: Exempted because table not used in .com nor Cells. notes: Exempted because table not used in .com nor Cells.
table_size: small table_size: small
...@@ -7,7 +7,6 @@ feature_categories: ...@@ -7,7 +7,6 @@ feature_categories:
description: Database partitioning metadata for CI tables description: Database partitioning metadata for CI tables
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96856 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96856
milestone: '15.4' milestone: '15.4'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
notes: Exempted because to be leveraged via Org Mover notes: Exempted because to be leveraged via Org Mover
table_size: small table_size: small
...@@ -9,7 +9,6 @@ feature_categories: ...@@ -9,7 +9,6 @@ feature_categories:
description: Routing table that holds information for runner taggings description: Routing table that holds information for runner taggings
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170778 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170778
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467664 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467664
table_size: small table_size: small
...@@ -9,6 +9,5 @@ feature_categories: ...@@ -9,6 +9,5 @@ feature_categories:
description: Table holding information for group runner taggings, partition of `ci_runner_taggings` description: Table holding information for group runner taggings, partition of `ci_runner_taggings`
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170778 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170778
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
...@@ -7,6 +7,5 @@ feature_categories: ...@@ -7,6 +7,5 @@ feature_categories:
description: Information about used Ci::Runner versions description: Information about used Ci::Runner versions
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90982 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90982
milestone: '15.2' milestone: '15.2'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
...@@ -7,8 +7,7 @@ feature_categories: ...@@ -7,8 +7,7 @@ feature_categories:
description: Contains data for calculating DevOps score. description: Contains data for calculating DevOps score.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb
milestone: '9.3' milestone: '9.3'
gitlab_schema: gitlab_main_cell gitlab_schema: gitlab_main_cell_local
exempt_from_sharding: true
notes: Exempted because Cell local table storing instance DevOps metrics calculated notes: Exempted because Cell local table storing instance DevOps metrics calculated
from service ping from service ping
table_size: small table_size: small
...@@ -7,7 +7,6 @@ feature_categories: ...@@ -7,7 +7,6 @@ feature_categories:
description: Tracks user access from specific countries. description: Tracks user access from specific countries.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157480 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157480
milestone: '17.2' milestone: '17.2'
gitlab_schema: gitlab_main_cell gitlab_schema: gitlab_main_cell_local
exempt_from_sharding: true
notes: Exempted because Not related to projects or groups notes: Exempted because Not related to projects or groups
table_size: small table_size: small
...@@ -9,8 +9,7 @@ feature_categories: ...@@ -9,8 +9,7 @@ feature_categories:
description: Routing table for CI runner managers description: Routing table for CI runner managers
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168131 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168131
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182859 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182859
removed_in_milestone: '17.10' removed_in_milestone: '17.10'
...@@ -9,8 +9,7 @@ feature_categories: ...@@ -9,8 +9,7 @@ feature_categories:
description: Routing table for CI runners description: Routing table for CI runners
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166308 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166308
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182549 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182549
removed_in_milestone: '17.10' removed_in_milestone: '17.10'
...@@ -9,8 +9,7 @@ feature_categories: ...@@ -9,8 +9,7 @@ feature_categories:
description: Information about runner managers associated to instance Ci::Runner models description: Information about runner managers associated to instance Ci::Runner models
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168131 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168131
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182859 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182859
removed_in_milestone: '17.10' removed_in_milestone: '17.10'
...@@ -9,8 +9,7 @@ feature_categories: ...@@ -9,8 +9,7 @@ feature_categories:
description: Registered CI instance runners description: Registered CI instance runners
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166308 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166308
milestone: '17.6' milestone: '17.6'
gitlab_schema: gitlab_ci gitlab_schema: gitlab_ci_cell_local
exempt_from_sharding: true
table_size: small table_size: small
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182549 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182549
removed_in_milestone: '17.10' removed_in_milestone: '17.10'
...@@ -10,5 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158908 ...@@ -10,5 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158908
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168288 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168288
milestone: '17.3' milestone: '17.3'
gitlab_schema: gitlab_sec gitlab_schema: gitlab_sec
exempt_from_sharding: true # See discussion on keys for pm_ tables https://gitlab.com/gitlab-org/gitlab/-/issues/434988#note_1827421068
removed_in_milestone: '17.6' removed_in_milestone: '17.6'
...@@ -9,6 +9,5 @@ description: Represents an Advanced Search index ...@@ -9,6 +9,5 @@ description: Represents an Advanced Search index
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113612/ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113612/
milestone: '15.11' milestone: '15.11'
gitlab_schema: gitlab_main_cell gitlab_schema: gitlab_main_cell
exempt_from_sharding: true
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170242 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170242
removed_in_milestone: '17.6' removed_in_milestone: '17.6'
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册