Skip to content

Fix Pipeline 2420105

路志远请求将fix-pipeline-2420105合并到pre-main-jh

What does this MR do and why?

Fix Pipeline https://jihulab.com/gitlab-cn/gitlab/-/pipelines/2420105

只有一个 Failed Job:https://jihulab.com/gitlab-cn/gitlab/-/jobs/12440468 ,包含两种错误:

1. jh/spec/lib/jh/backup/manager_spec.rb

1) Backup::Manager#create when keep_time is set to remove files removes matching files with a human-readable versioned timestamp with tagged JH
     Failure/Error: connection.public_send(...)
     ActiveSupport::Notifications::InstrumentationSubscriberError:
       Exception(s) occurred within instrumentation subscribers: Gitlab::Database::GitlabSchema::UnknownSchemaError, Gitlab::Database::GitlabSchema::UnknownSchemaError

这个 Spec 是两年前的代码,逻辑太复杂,不过它的目的只是为了测试 JiHu 这边 override 的函数 backup_file? ,所以直接把 Spec 按照 Upstream 的重写了一遍。

2. CrossJoinAcrossUnsupportedTablesError

代码中的 group.owners.first 是在做跨数据库查询,现在不被允许,所以报错。

按照 Upstream 的做法,可以先创建 Issue 来搁置问题。

image

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

路志远 编辑于

合并请求报告

加载中