i18n(ja): restore DM-master and DM-worker as literal English terms - #23635
Conversation
|
Skipping CI for Draft Pull Request. |
ti-chi-bot
Bot
added
the
do-not-merge/work-in-progress
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughThis documentation-only change standardizes DM-master and DM-worker terminology across Japanese reference, deployment, operational, migration, TiUP, and release-note documents. It also updates selected deployment guidance and release-note entries. ChangesDM documentation terminology
Estimated code review effort: 2 (Simple) | ~15 minutes Merge Risk: 🔵 Low · up to This change standardizes Japanese DM component names, but several inconsistent or ambiguous command and component references remain. They can confuse users following deployment or migration documentation, so the edits should be completed before merge. Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches 💡 1🛠️ Fix failing CI checks 💡
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
ti-chi-bot
Bot
added
missing-translation-status
qiancai
added
translation/no-need
f2841cb to
ba1acb0
Compare
ti-chi-bot
Bot
removed
the
do-not-merge/work-in-progress
ba1acb0 to
ebd971e
Compare
DM-master and DM-worker are the actual TiDB Data Migration (DM) tool component/binary names, matching the dm-master/dm-worker binaries and dm/master, dm/worker paths — not descriptive nouns that should be translated. Unifies the katakana renderings (DMマスター/DMワーカー) to literal DM-master/DM-worker throughout, per the direction already decided. 56 files, 265 sites.
The initial mechanical substitution only matched the no-space form (DMマスター/DMワーカー) and missed the space-separated variant (DM マスター/DM ワーカー), used in ~45 more files. Same fix, same rationale: these are the actual TiDB Data Migration (DM) tool component names, matching the dm-master/dm-worker binaries. 45 files, 200 sites.
ebd971e to
79a030a
Compare
# Conflicts: # releases/release-5.3.1.md # releases/release-5.3.2.md # releases/release-5.4.1.md # releases/release-5.4.3.md # releases/release-6.0.0-dmr.md # releases/release-6.1.0.md # releases/release-6.1.1.md # releases/release-6.1.2.md # releases/release-6.1.3.md # releases/release-6.5.0.md # releases/release-6.5.12.md # releases/release-7.1.1.md # releases/release-7.1.6.md # releases/release-7.5.4.md # releases/release-8.1.2.md
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 10
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
dm/usage-scenario-master-slave-switch.md (1)
32-32: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick winReplace the remaining
DM-worktypos.The file now uses
DM-worker, but Lines 32 and 46 still sayDM-work 接続. Replace both withDM-worker接続.As per path instructions, this fix spans noncontiguous lines, so a regular review comment is appropriate.
Also applies to: 46-46
Source: Path instructions
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Team
Run ID: 4df63325-4656-4a44-825f-8c6adc893b30
📒 Files selected for processing (72)
TOC.mdapi/_index.mdapi/dm-api-overview.mdbest-practices-for-security-configuration.mddm/deploy-a-dm-cluster-using-binary.mddm/deploy-a-dm-cluster-using-tiup-offline.mddm/deploy-a-dm-cluster-using-tiup.mddm/dm-arch.mddm/dm-best-practices.mddm/dm-command-line-flags.mddm/dm-config-overview.mddm/dm-customized-secret-key.mddm/dm-daily-check.mddm/dm-enable-tls.mddm/dm-error-handling.mddm/dm-faq.mddm/dm-generate-self-signed-certificates.mddm/dm-glossary.mddm/dm-handle-alerts.mddm/dm-handle-performance-issues.mddm/dm-hardware-and-software-requirements.mddm/dm-manage-source.mddm/dm-master-configuration-file.mddm/dm-open-api.mddm/dm-performance-test.mddm/dm-query-status.mddm/dm-safe-mode.mddm/dm-source-configuration-file.mddm/dm-worker-configuration-file.mddm/dm-worker-intro.mddm/dmctl-introduction.mddm/feature-shard-merge-optimistic.mddm/feature-shard-merge-pessimistic.mddm/maintain-dm-using-tiup.mddm/manually-handling-sharding-ddl-locks.mddm/manually-upgrade-dm-1.0-to-2.0.mddm/migrate-data-using-dm.mddm/monitor-a-dm-cluster.mddm/quick-start-create-task.mddm/quick-start-with-dm.mddm/relay-log.mddm/shard-merge-best-practices.mddm/task-configuration-file-full.mddm/usage-scenario-master-slave-switch.mdmigrate-large-mysql-shards-to-tidb.mdmigrate-small-mysql-shards-to-tidb.mdmigrate-small-mysql-to-tidb.mdmigrate-with-more-columns-downstream.mdreleases/release-5.3.1.mdreleases/release-5.3.2.mdreleases/release-5.4.0.mdreleases/release-5.4.1.mdreleases/release-5.4.3.mdreleases/release-6.0.0-dmr.mdreleases/release-6.1.0.mdreleases/release-6.1.1.mdreleases/release-6.1.2.mdreleases/release-6.1.3.mdreleases/release-6.4.0.mdreleases/release-6.5.0.mdreleases/release-6.5.12.mdreleases/release-7.0.0.mdreleases/release-7.1.1.mdreleases/release-7.1.6.mdreleases/release-7.5.4.mdreleases/release-8.1.2.mdreleases/release-8.4.0.mdreleases/release-8.5.0.mdtidb-cloud/migrate-sql-shards.mdtiup/tiup-component-dm-import.mdtiup/tiup-component-dm-template.mdtiup/tiup-dm-topology-reference.md
Included review availability: Your plan provides up to 4 included reviews per hour; 3 remain after this review.
…d grammar defects
There was a problem hiding this comment.
Actionable comments posted: 1
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Team
Run ID: 411e6458-f4a2-41ba-aeca-926de590b997
📒 Files selected for processing (10)
dm/dm-config-overview.mddm/dm-customized-secret-key.mddm/manually-upgrade-dm-1.0-to-2.0.mddm/monitor-a-dm-cluster.mdmigrate-small-mysql-to-tidb.mdreleases/release-5.3.2.mdreleases/release-5.4.1.mdreleases/release-6.1.0.mdtiup/tiup-component-dm-template.mdtiup/tiup-dm-topology-reference.md
Included review availability: Your plan provides up to 4 included reviews per hour; 0 remain after this review.
…er terminology in PR pingcap#23635
| - PDアドレスの完全な変更後、TiDBが`SHOW PUMP STATUS`または`SHOW DRAINER STATUS`経由でBinlogノードステータスを正しく照会できない問題を修正しました。 [#42643](https://github.com/pingcap/tidb/issues/42643) @[lichunzhu](https://github.com/lichunzhu) | ||
| - PD アドレスの完全な変更後に TiDB がバイナリログを書き込めなくなる問題を修正しました [#42643](https://github.com/pingcap/tidb/issues/42643) @[lance6716](https://github.com/lance6716) | ||
| - etcdクライアントが初期化中に最新のノード情報を自動的に同期しない問題を修正[#1236](https://github.com/pingcap/tidb-binlog/issues/1236) @[lichunzhu](https://github.com/lichunzhu) | ||
| - 移行対象のテーブル内の一意インデックスに空の列が含まれている場合にDM-masterが異常終了する問題を修正[#9247](https://github.com/pingcap/tiflow/issues/9247) @[lance6716](https://github.com/lance6716) |
There was a problem hiding this comment.
@yahonda The lines after 138 need to be added back. PTAL. Thanks.
There was a problem hiding this comment.
Thank you for catching this — confirmed and fixed. An earlier merge-conflict resolution in this branch's history had silently dropped large legitimate chunks of content (release notes added by sibling PRs already merged into the base) instead of properly combining both sides. I audited all files this PR touches and found the same silent-deletion pattern in 13 release-note files total (release-5.3.1/5.3.2/5.4.1/5.4.3/6.0.0-dmr/6.1.0/6.1.1/6.1.2/6.5.0/6.5.12/7.1.1/7.1.6/7.5.4.md). All 13 have been repaired by rebuilding each file from the current upstream/i18n-ja-release-8.5 base (which has the full correct content) and re-applying only this PR's own DM-master/DM-worker terminology fix on top -- verified every file's line count now matches upstream exactly, with only clean single-line diffs remaining. Sorry for the trouble, and thanks again for flagging it.
| - 複数の DM-masterノードが同時にリーダーになり、データの不整合が発生する可能性がある問題を修正しました[#11602](https://github.com/pingcap/tiflow/issues/11602) @[GMHDBJD](https://github.com/GMHDBJD) | ||
| - `go-mysql` にアップグレードして接続ブロックの問題を修正しました [#11041](https://github.com/pingcap/tiflow/issues/11041) @[D3Hunter](https://github.com/D3Hunter) | ||
| - インデックスの長さがデフォルト値の`max-index-length` を超えるとデータレプリケーションが中断される問題を修正しました [#11459](https://github.com/pingcap/tiflow/issues/11459) @[michaelmdeng](https://github.com/michaelmdeng) | ||
| - LISTパーティションテーブルの`ALTER TABLE ... DROP PARTITION`文を複製するときにDMがエラーを返す問題を修正しました。 [#54760](https://github.com/pingcap/tidb/issues/54760) @[lance6716](https://github.com/lance6716) |
There was a problem hiding this comment.
Same here, some lines are deleted by mistake. Please check this change for all other release notes in this PR. Thanks. @yahonda
There was a problem hiding this comment.
Same fix applies here -- see my reply on the release-7.1.1.md thread for the full explanation. This file's content has been restored to match upstream/i18n-ja-release-8.5 exactly, with only this PR's own DM-master/DM-worker terminology change remaining as a clean single-line diff.
# Conflicts: # releases/release-5.4.1.md # releases/release-6.0.0-dmr.md
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
releases/release-6.1.0.md (1)
430-430: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick winUse the standardized
DM-masterspelling.Line 430 still uses
dm-master. Replace only the component name so this release note uses the sameDM-masterspelling as the other DM documentation.- 空の設定により DM-masterがpanicを起こす可能性がある問題を修正[`#3732`](https://github.com/pingcap/tiflow/issues/3732)As per path instructions, this Markdown finding includes an exact GitHub committable replacement.
Source: Path instructions
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Team
Run ID: 22593bb9-d20e-492f-a1b3-6d6f6d4bf398
📒 Files selected for processing (15)
dm/monitor-a-dm-cluster.mdreleases/release-5.3.1.mdreleases/release-5.3.2.mdreleases/release-5.4.0.mdreleases/release-5.4.1.mdreleases/release-5.4.3.mdreleases/release-6.0.0-dmr.mdreleases/release-6.1.0.mdreleases/release-6.1.1.mdreleases/release-6.1.2.mdreleases/release-6.5.0.mdreleases/release-6.5.12.mdreleases/release-7.1.1.mdreleases/release-7.1.6.mdreleases/release-7.5.4.md
Included review availability: Your plan provides up to 4 included reviews per hour; 2 remain after this review.
[LGTM Timeline notifier]Timeline:
|
2 participants
What is changed, added or deleted? (Required)
DM-masterandDM-workerare the actual TiDB Data Migration (DM) tool component/binary names (matching thedm-master/dm-workerbinaries anddm/master,dm/workerpaths), not descriptive nouns that should be translated. This corpus rendered them inconsistently as katakanaDMマスター/DMワーカー(and, found on a second pass, the space-separated variantDM マスター/DM ワーカー) in many places while other places already correctly kept them literal (DM-master/DM-worker).This PR unifies all katakana occurrences (both spacing variants) to the literal English form, matching the direction already decided in a prior term-notation review.
DMマスター/DM マスター→DM-masterDMワーカー/DM ワーカー→DM-worker101 files total, 465 sites (265 no-space + 200 space-separated, found on independent review of the first pass). Heading anchors (
{#...}) were already stable English slugs, independent of the visible heading text, so none needed changing.Generic uses of bare マスター/ワーカー (e.g. "master branch", other components) are unrelated to this term and were not touched — only the DM-prefixed forms were in scope.
Verified
markdownlint-cli2clean on all touched files.Which TiDB version(s) do your changes apply to? (Required)
What is the related PR or file link(s)?
AI agent involvement
Do your changes match any of the following descriptions?
Summary by CodeRabbit