Skip to content

[fix](doc) backport 3 cross-version consistency fixes to 2.1/3.x #3743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 1 commit into from
May 23, 2026
Merged

[fix](doc) backport 3 cross-version consistency fixes to 2.1/3.x #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check warning on line 1 in i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-title-duplicate 

Rendered SEO title is duplicated across indexable pages%3A "恢复 - Apache Doris". Add a version%2C locale%2C or page-specific qualifier. Owner%3A @apache/doris-website-maintainers

Check warning on line 1 in i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-description-length 

SEO description should be 80-160 characters; current length is 47. Owner%3A @apache/doris-website-maintainers
{
"title": "恢复",
"language": "zh-CN",
Expand All @@ -17,11 +17,11 @@

```sql
mysql> SHOW SNAPSHOT ON example_repo;
+-----------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+--------------------+---------------------+--------+
| exampledb_20241225 | 2022-04-08-15-52-29 | OK |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
1 row in set (0.15 sec)
```

Expand Down
8 changes: 4 additions & 4 deletions ...ugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check warning on line 1 in i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-title-duplicate 

Rendered SEO title is duplicated across indexable pages%3A "恢复 - Apache Doris". Add a version%2C locale%2C or page-specific qualifier. Owner%3A @apache/doris-website-maintainers

Check warning on line 1 in i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-description-length 

SEO description should be 80-160 characters; current length is 47. Owner%3A @apache/doris-website-maintainers
{
"title": "恢复",
"language": "zh-CN",
Expand All @@ -17,11 +17,11 @@

```sql
mysql> SHOW SNAPSHOT ON example_repo;
+-----------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+--------------------+---------------------+--------+
| exampledb_20241225 | 2022-04-08-15-52-29 | OK |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
1 row in set (0.15 sec)
```

Expand Down
8 changes: 4 additions & 4 deletions versioned_docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ The following SQL statement can be used to view existing backups in the Reposito

```sql
mysql> SHOW SNAPSHOT ON example_repo;
+-----------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+--------------------+---------------------+--------+
| exampledb_20241225 | 2022-04-08-15-52-29 | OK |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
1 row in set (0.15 sec)
```

Expand Down
2 changes: 1 addition & 1 deletion versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check notice on line 1 in versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md

View workflow job for this annotation

GitHub Actions / Build Check

i18n-sync-locale-candidate 

Japanese docs are report-only. Generate a candidate translation from the changed files and merge it only after human review. Owner%3A @apache/doris-website-maintainers

Check notice on line 1 in versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md

View workflow job for this annotation

GitHub Actions / Build Check

i18n-sync-locale-counterpart 

Chinese 3.x counterpart exists. Confirm whether the change is supported in 3.x before leaving it unsynced. Owner%3A @apache/doris-website-maintainers

Check warning on line 1 in versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-title-duplicate 

Rendered SEO title is duplicated across indexable pages%3A "Upgrading Cluster - Apache Doris". Add a version%2C locale%2C or page-specific qualifier. Owner%3A @apache/doris-website-maintainers
{
"title": "Upgrading Cluster",
"language": "en",
Expand All @@ -18,7 +18,7 @@

- **Two-digit and one-digit versions:** Cross-version upgrades for two-digit versions are not recommended due to compatibility concerns. It is advised to upgrade sequentially through each two-digit version. For example, upgrading from version 3.0 to 3.3 should follow the sequence 3.0 -> 3.1 -> 3.2 -> 3.3.

The detailed version information can be found in the [versioning rules](https://doris.apache.org/community/release-and-verify/release-versioning).

Check notice on line 21 in versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md

View workflow job for this annotation

GitHub Actions / Build Check

link-external-report-only 

External link is report-only and was not fetched%3A https%3A//doris.apache.org/community/release-and-verify/release-versioning. Owner%3A @apache/doris-website-maintainers

## Upgrade Precautions

Expand Down Expand Up @@ -50,7 +50,7 @@

Use the `show frontends` command and refer to the `IsMaster` column to identify the Master FE node. FE metadata can be hot-backed up without stopping the FE node. By default, FE metadata is stored in the `fe/doris-meta` directory. This can be confirmed via the `meta_dir` parameter in the `fe.conf` configuration file.

2. **Modify the `fe.conf` configuration file of the test FE node:**

Check warning on line 53 in versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md

View workflow job for this annotation

GitHub Actions / Build Check

markdown-code-fence-language 

Code fence should declare a language. Owner%3A @apache/doris-website-maintainers

```bash
vi ${DORIS_NEW_HOME}/conf/fe.conf
Expand All @@ -67,7 +67,7 @@
edit_log_port = 19010

## modify clusterIP
clusterId=<a_new_clusterIP, such as 123456>
clusterId=<a_new_clusterID, such as 123456>
...
```

Expand Down
4 changes: 2 additions & 2 deletions versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check notice on line 1 in versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md

View workflow job for this annotation

GitHub Actions / Build Check

i18n-sync-locale-candidate 

Japanese docs are report-only. Generate a candidate translation from the changed files and merge it only after human review. Owner%3A @apache/doris-website-maintainers

Check notice on line 1 in versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md

View workflow job for this annotation

GitHub Actions / Build Check

i18n-sync-locale-counterpart 

Chinese 3.x counterpart exists. Confirm whether the change is supported in 3.x before leaving it unsynced. Owner%3A @apache/doris-website-maintainers

Check warning on line 1 in versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md

View workflow job for this annotation

GitHub Actions / Build Check

seo-title-duplicate 

Rendered SEO title is duplicated across indexable pages%3A "Backup - Apache Doris". Add a version%2C locale%2C or page-specific qualifier. Owner%3A @apache/doris-website-maintainers
{
"title": "Backup",
"language": "en",
Expand Down Expand Up @@ -49,8 +49,8 @@
PROPERTIES
(
"azure.endpoint" = "https://<account_name>.blob.core.windows.net",
"azure.account_name" = "ak",
"azure.account_key" = "sk",
"azure.account_name" = "<account_name>",
"azure.account_key" = "<account_key>",
"provider" = "AZURE"
);
```
Expand Down
8 changes: 4 additions & 4 deletions versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check notice on line 1 in versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md

View workflow job for this annotation

GitHub Actions / Build Check

i18n-sync-locale-candidate 

Japanese docs are report-only. Generate a candidate translation from the changed files and merge it only after human review. Owner%3A @apache/doris-website-maintainers
{
"title": "Restore",
"language": "en",
Expand All @@ -18,11 +18,11 @@

```sql
mysql> SHOW SNAPSHOT ON example_repo;
+-----------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
| Snapshot | Timestamp | Status |
+--------------------+---------------------+--------+
| exampledb_20241225 | 2022-04-08-15-52-29 | OK |
+-----------------+---------------------+--------+
+--------------------+---------------------+--------+
1 row in set (0.15 sec)
```

Expand Down
Loading