From fd01890a3749315333ecab81d24ff6f387b2ecfe Mon Sep 17 00:00:00 2001
From: KID-G <362753231@qq.com>
Date: Fri, 23 Apr 2021 13:49:12 +0800
Subject: [PATCH] fix wrong word #51
---
README.md | 36 +++++++++++++-----------------------
README_zh.md | 40 ++++++++++++++++++++--------------------
2 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/README.md b/README.md
index 9543d6c0..932e2d45 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,21 @@
# XenonDB
-> English | [中文](README_zh.md)
+English | [中文](README_zh.md)
-## What is XenonDB
+## What is XenonDB?
[XnenoDB](https://github.com/radondb/xenondb) is a open-source, cloud-native, highly available cluster solutions that is based on [MySQL](https://MySQL.org) database. With the Raft protocol,XenonDB provide the faster failover performance without losing any transactions.
+At present, XenonDB has supported the deployment of MySQL high availability clusters on kubernetes and kubesphere platforms.
+
## Architecture
- Achieving decentralized election through the Raft protocol.
- Synchronize data based on GTID mode through Semi-Sync.
![](docs/images/XenonDB_Architecture_1.png)
-
-<<<<<<< HEAD
## Features
-
- High availability MySQL database
- Non-centralized automatic leader election
- Second level switch leader to follower
@@ -27,37 +26,28 @@
- Account management
## Installation
-
-There are support that depoy XenonDB on the Kubernetes or Kubesphere platforms.
+There are support that depoy XneonDB on the Kubernetes or Kubesphere platforms.
- [Deploy xenonDB on Kubernetes](docs/Kubernetes/deploy_xenondb_on_kubernetes.md)
-
- [Deploy xenonDB on the appstore of KubeSphere](docs/KubeSphere/deploy_xenondb_on_kubesphere.md)
## Release
-
-| Release | Features |
-|------|--------|
-| Helm | High availability
Non-centralized automatic leader election
Second level switch
Strongly consistent data
Cluster management
Monitoring and alerting
Logs
Account management |
-| Operator 1.0 | Node management
Automatic expansion and shrinkage capacity
Upgrade
Backups and Restorations
Automatic failover
Automatic rebuild node
Automatic restart service(all or signal node)
Account management(API)
Migrating Data online |
-| Operator 2.0 | Automatic O&M
Multiple node roles
Disaster Recovery
SSL transmission encryption |
-
-## Who are using XenonDB
+| Release | Features | Mode |
+|------|--------|--------|
+| 1.0 | High availability
Non-centralized automatic leader election
Second level switch
Strongly consistent data
Cluster management
Monitoring and alerting
Logs
Account management | Helm |
+| 2.0 | Node management
Automatic expansion and shrinkage capacity
Upgrade
Backups and Restorations
Automatic failover
Automatic rebuild node
Automatic restart service(all or signal node)
Account management(API)
Migrating Data online | Operator |
+| 3.0 | Automatic O&M
Multiple node roles
Disaster Recovery
SSL transmission encryption | Operator |
+## Who are using XenonDB?
![](docs/images/users.png)
-
## License
XenonDB is released under the Apache 2.0, see [LICENSE](./LICENSE).
-
## Discussion and Community
- Forum
-
- The XenonDB topic in [Kubesphere Community](https://github.com/kubesphere/community).
-
+ The XenonDB topic in [Kubesphere Community](https://kubesphere.com.cn/forum/).
- WeChat group
-
- ![](docs/images/wechat_group.png)
+ ![](docs/images/wechat_group.png)
Please submit any XenonDB bugs, issues, and feature requests to XenonDB GitHub Issue.
diff --git a/README_zh.md b/README_zh.md
index f3466765..9c71a065 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -1,11 +1,11 @@
# XenonDB
-> [English](README.md)| 中文
-
+[English](README.md) | 中文
## 什么是 XenonDB?
XenonDB 是基于 MySQL 的开源、高可用、云原生集群解决方案。支持一主多从高可用架构,并具备安全、自动备份、监控告警、自动扩容等全套管理功能。
+目前 XenonDB 已支持 Kubernetes 和 KubeSphere 平台部署 MySQL 高可用集群。
## 架构图
@@ -26,35 +26,35 @@ XenonDB 是基于 MySQL 的开源、高可用、云原生集群解决方案。
- 账户管理
## 快速部署
-
目前已支持在 Kubernetes 和 KubeSphere 平台的部署。
-- [在 Kubernetes 平台部署](docs/Kubernetes/deploy_xenondb_on_kubernetes.md)
-- [在 KubeSphere 应用商店部署](docs/KubeSphere/deploy_xenondb_on_kubesphere.md)
-## 版本路线
+- [ 在 Kubernetes 上部署 XenonDB 集群](docs/Kubernetes/deploy_xenondb_on_kubernetes.md)
+- [ 在 Kubesphere 上部署 XenonDB 集群 ](docs/KubeSphere/deploy_xenondb_on_kubesphere.md)
-| 版本 | 功能 |
-|------|--------|
-| Helm | MySQL 高可用
无中心化自动选主
主从秒级别切换
数据强一致性
集群管理
监控告警
集群日志管理
账户管理 |
-| Operator 1.0 | 增删节点
自动扩缩容
升级集群
备份与恢复
故障自动转移
自动重建节点
自动重启服务
账户管理(提供 API 接口)
在线迁移 |
-| Operator 2.0 | 自动化运维
多节点角色
灾备集群
SSL 传输加密 |
+## 版本路线
+| 版本 | 功能 | 实现方式 |
+|------|--------|------|
+| 1.0 | MySQL 高可用
无中心化自动选主
主从秒级别切换
数据强一致性
集群管理
监控告警
集群日志管理
账户管理 | Helm |
+| 2.0 | 增删节点
自动扩缩容
升级集群
备份与恢复
故障自动转移
自动重建节点
自动重启服务
账户管理(提供 API 接口)
在线迁移 | Operator |
+| 3.0 | 自动化运维
多节点角色
灾备集群
SSL 传输加密 | Operator |
-## 应用案例
+## 用户案例
![](docs/images/users.png)
-
## 协议
-XenonDB 基于 Apache 2.0 协议,详见[LICENSE](./LICENSE)。
+XenonDB 基于 Apache 2.0 协议,详见 [LICENSE](./LICENSE)。
## 欢迎加入社区话题互动
-- 论坛:
-
- 欢迎加入 [Kubesphere 开发者社区](https://github.com/kubesphere/community)XenonDB 技术专区参与讨论。
+- 论坛
+ 请加入[Kubesphere 开发者社区](https://kubesphere.com.cn/forum/) XenonDB 话题专区。
+
+- 微信群
+ ![](docs/images/wechat_group.png)
+
+有任何 XenonDB 错误、问题和功能,请您提交在 XenonDB GitHub 提交 Issue。
+
-- 微信群
-
- ![](docs/images/wechat_group.png)
\ No newline at end of file