diff --git a/frontend/src/pages/Replication/Replication.tsx b/frontend/src/pages/Replication/Replication.tsx index 751077b..2fb1cc5 100644 --- a/frontend/src/pages/Replication/Replication.tsx +++ b/frontend/src/pages/Replication/Replication.tsx @@ -35,6 +35,8 @@ interface ReplicationQueueItem { last_attempt_time: string num_attempts: number type: string + postpone_reason: string + postpone: string } export default function Replication() { @@ -82,19 +84,29 @@ export default function Replication() { key: 'table', }, { - title: 'Error', - dataIndex: 'error', - key: 'error', - render: (error: string) => ( - ( + reason ? - {error} - + {reason} + : null ), }, { @@ -102,16 +114,27 @@ export default function Replication() { dataIndex: 'last_attempt_time', key: 'last_attempt_time', }, + { + title: 'Exception', + dataIndex: 'last_exception', + key: 'last_exception', + render: (last_exception: string) => ( + last_exception ? + {last_exception} + : null + ), + }, { title: 'Attempts', dataIndex: 'num_attempts', key: 'num_attempts', }, - { - title: 'Type', - dataIndex: 'type', - key: 'type', - }, ] usePollingEffect( diff --git a/housewatch/clickhouse/clusters.py b/housewatch/clickhouse/clusters.py index b0813ab..93fd94f 100644 --- a/housewatch/clickhouse/clusters.py +++ b/housewatch/clickhouse/clusters.py @@ -86,7 +86,6 @@ def get_replication_queue(node): last_attempt_time, last_postpone_time, postpone_reason, - last_postpone_time, merge_type FROM system.replication_queue WHERE last_exception != '' or postpone_reason != ''