From 55d2aa5fc465b16e6675d084f5497d0a5a562171 Mon Sep 17 00:00:00 2001 From: rearcher <123781007@qq.com> Date: Tue, 11 Mar 2025 10:36:06 +0800 Subject: [PATCH] fix ragdoll synchronize error --- ...fix-ragdoll-domain-table-synchronize.patch | 31 +++++++++++++++++++ aops-zeus.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0002-fix-ragdoll-domain-table-synchronize.patch diff --git a/0002-fix-ragdoll-domain-table-synchronize.patch b/0002-fix-ragdoll-domain-table-synchronize.patch new file mode 100644 index 0000000..3663c67 --- /dev/null +++ b/0002-fix-ragdoll-domain-table-synchronize.patch @@ -0,0 +1,31 @@ +From 69a6b5bf8757ad99d56dcb1d85a811e027405f41 Mon Sep 17 00:00:00 2001 +From: rearcher <123781007@qq.com> +Date: Mon, 10 Mar 2025 20:42:28 +0800 +Subject: [PATCH] fix ragdoll domain table synchronize failed + +--- + .../tasks/synchronize_conf/rdb_conf/domain.yml | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/async-task/async_task/tasks/synchronize_conf/rdb_conf/domain.yml b/async-task/async_task/tasks/synchronize_conf/rdb_conf/domain.yml +index 967ef07..5a5c1df 100644 +--- a/async-task/async_task/tasks/synchronize_conf/rdb_conf/domain.yml ++++ b/async-task/async_task/tasks/synchronize_conf/rdb_conf/domain.yml +@@ -9,6 +9,13 @@ dbMapping: + targetTable: domain + targetPk: + domain_id: domain_id +- mapAll: true ++ mapAll: false ++ targetColumns: ++ # 字段映射, 格式: 目标表字段: 源表字段, 如果字段名一样源表字段名可不填 ++ # 注意数据源的 to: from 前面是数据要同步到的地方，后面是数据来源的 ++ domain_id: domain_id ++ domain_name: domain_name ++ cluster_id: cluster_id ++ priority: priority + etlCondition: "where c_time>={}" + commitBatch: 3000 # 批量提交的大小 +-- +Gitee + diff --git a/aops-zeus.spec b/aops-zeus.spec index e5f3e4d..bf66959 100644 --- a/aops-zeus.spec +++ b/aops-zeus.spec @@ -1,12 +1,13 @@ %define vulcanus_version v2.1.0 Name: aops-zeus Version: v2.1.0 -Release: 5 +Release: 6 Summary: A service which is the foundation of aops. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz Patch0001: 0001-fix-reids-protected-mode.patch +Patch0002: 0002-fix-ragdoll-domain-table-synchronize.patch BuildRequires: python3-setuptools Requires: python3-pyyaml python3-PyMySQL python3-kazoo python3-click @@ -167,6 +168,9 @@ popd %{python3_sitelib}/zeus/distribute_service/* %changelog +* Tue Mar 11 2025 luxuexian - v2.1.0-6 +- Fix ragdoll domain table synchronize failed + * Tue Mar 4 2025 gongzhengtang - v2.1.0-5 - Add zeus-operation build and fix redis protected mode -- Gitee