Skip to content
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.

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

[vtadmin-web] Display timestamps + stream counts on Workflows view #8009

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions web/vtadmin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions web/vtadmin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@types/react-dom": "^16.9.10",
"@types/react-router-dom": "^5.1.7",
"classnames": "^2.2.6",
"dayjs": "^1.10.4",
"downshift": "^6.1.0",
"history": "^5.0.0",
"lodash-es": "^4.17.20",
Expand Down
33 changes: 33 additions & 0 deletions web/vtadmin/src/components/pips/StreamStatePip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* Copyright 2021 The Vitess Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Pip, PipState } from './Pip';

interface Props {
state?: string | null | undefined;
}

// TODO(doeg): add a protobuf enum for this (https://github.com/vitessio/vitess/projects/12#card-60190340)
const STREAM_STATES: { [key: string]: PipState } = {
Copying: 'primary',
Error: 'danger',
Running: 'success',
Stopped: null,
};

export const StreamStatePip = ({ state }: Props) => {
const pipState = state ? STREAM_STATES[state] : null;
return <Pip state={pipState} />;
};
7 changes: 7 additions & 0 deletions web/vtadmin/src/components/routes/Workflows.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@
grid-template-columns: 1fr min-content;
margin-bottom: 24px;
}

.shardList {
color: var(--textColorSecondary);
font-size: var(--fontSizeSmall);
max-width: 20rem;
padding-right: 24px;
}
61 changes: 43 additions & 18 deletions web/vtadmin/src/components/routes/Workflows.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { orderBy } from 'lodash-es';
import { groupBy, orderBy } from 'lodash-es';
import * as React from 'react';
import { Link } from 'react-router-dom';

Expand All @@ -27,22 +27,27 @@ import { Icons } from '../Icon';
import { TextInput } from '../TextInput';
import { useSyncedURLParam } from '../../hooks/useSyncedURLParam';
import { filterNouns } from '../../util/filterNouns';
import { getStreams, getTimeUpdated } from '../../util/workflows';
import { formatDateTime, formatRelativeTime } from '../../util/time';
import { StreamStatePip } from '../pips/StreamStatePip';

export const Workflows = () => {
useDocumentTitle('Workflows');
const { data } = useWorkflows();
const { data } = useWorkflows({ refetchInterval: 1000 });
const { value: filter, updateValue: updateFilter } = useSyncedURLParam('filter');

const sortedData = React.useMemo(() => {
const mapped = (data || []).map(({ cluster, keyspace, workflow }) => ({
clusterID: cluster?.id,
clusterName: cluster?.name,
keyspace,
name: workflow?.name,
source: workflow?.source?.keyspace,
sourceShards: workflow?.source?.shards,
target: workflow?.target?.keyspace,
targetShards: workflow?.target?.shards,
const mapped = (data || []).map((workflow) => ({
clusterID: workflow.cluster?.id,
clusterName: workflow.cluster?.name,
keyspace: workflow.keyspace,
name: workflow.workflow?.name,
source: workflow.workflow?.source?.keyspace,
sourceShards: workflow.workflow?.source?.shards,
streams: groupBy(getStreams(workflow), 'state'),
target: workflow.workflow?.target?.keyspace,
targetShards: workflow.workflow?.target?.shards,
timeUpdated: getTimeUpdated(workflow),
}));
const filtered = filterNouns(filter, mapped);
return orderBy(filtered, ['name', 'clusterName', 'source', 'target']);
Expand All @@ -65,9 +70,7 @@ export const Workflows = () => {
{row.source ? (
<>
<div>{row.source}</div>
<div className="font-size-small text-color-secondary">
{(row.sourceShards || []).join(', ')}
</div>
<div className={style.shardList}>{(row.sourceShards || []).join(', ')}</div>
</>
) : (
<span className="text-color-secondary">N/A</span>
Expand All @@ -77,14 +80,32 @@ export const Workflows = () => {
{row.target ? (
<>
<div>{row.target}</div>
<div className="font-size-small text-color-secondary">
{(row.targetShards || []).join(', ')}
</div>
<div className={style.shardList}>{(row.targetShards || []).join(', ')}</div>
</>
) : (
<span className="text-color-secondary">N/A</span>
)}
</DataCell>

{/* TODO(doeg): add a protobuf enum for this (https://github.com/vitessio/vitess/projects/12#card-60190340) */}
{['Error', 'Copying', 'Running', 'Stopped'].map((streamState) => (
<DataCell key={streamState}>
{streamState in row.streams ? (
<>
<StreamStatePip state={streamState} /> {row.streams[streamState].length}
</>
) : (
<span className="text-color-secondary">-</span>
)}
</DataCell>
))}

<DataCell>
<div className="font-family-primary white-space-nowrap">{formatDateTime(row.timeUpdated)}</div>
<div className="font-family-primary font-size-small text-color-secondary">
{formatRelativeTime(row.timeUpdated)}
</div>
</DataCell>
</tr>
);
});
Expand All @@ -106,7 +127,11 @@ export const Workflows = () => {
</Button>
</div>

<DataTable columns={['Workflow', 'Source', 'Target']} data={sortedData} renderRows={renderRows} />
<DataTable
columns={['Workflow', 'Source', 'Target', 'Error', 'Copying', 'Running', 'Stopped', 'Last Updated']}
data={sortedData}
renderRows={renderRows}
/>
</div>
);
};
4 changes: 4 additions & 0 deletions web/vtadmin/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ table tbody td[rowSpan] {
font-family: var(--fontFamilyMonospace);
}

.font-family-primary {
font-family: var(--fontFamilyPrimary);
}

.font-size-small {
font-size: var(--fontSizeSmall);
}
Expand Down
42 changes: 42 additions & 0 deletions web/vtadmin/src/util/time.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/**
* Copyright 2021 The Vitess Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import * as dayjs from 'dayjs';
import localizedFormat from 'dayjs/plugin/localizedFormat';
import relativeTime from 'dayjs/plugin/relativeTime';

dayjs.extend(localizedFormat);
dayjs.extend(relativeTime);

export const parse = (timestamp: number | null | undefined): dayjs.Dayjs | null => {
if (typeof timestamp !== 'number') {
return null;
}
return dayjs.unix(timestamp);
};

export const format = (timestamp: number | null | undefined, template: string | undefined): string | null => {
const u = parse(timestamp);
return u ? u.format(template) : null;
};

export const formatDateTime = (timestamp: number | null | undefined): string | null => {
return format(timestamp, 'YYYY-MM-DD LT');
};

export const formatRelativeTime = (timestamp: number | null | undefined): string | null => {
const u = parse(timestamp);
return u ? u.fromNow() : null;
};
72 changes: 72 additions & 0 deletions web/vtadmin/src/util/workflows.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/**
* Copyright 2021 The Vitess Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { vtadmin as pb } from '../proto/vtadmin';
import { getStreams } from './workflows';

describe('getStreams', () => {
const tests: {
name: string;
input: Parameters<typeof getStreams>;
expected: ReturnType<typeof getStreams>;
}[] = [
{
name: 'should return a flat list of streams',
input: [
pb.Workflow.create({
workflow: {
shard_streams: {
'-80/us_east_1a-123456': {
streams: [
{ id: 1, shard: '-80' },
{ id: 2, shard: '-80' },
],
},
'80-/us_east_1a-789012': {
streams: [
{ id: 1, shard: '80-' },
{ id: 2, shard: '80-' },
],
},
},
},
}),
],
expected: [
{ id: 1, shard: '-80' },
{ id: 2, shard: '-80' },
{ id: 1, shard: '80-' },
{ id: 2, shard: '80-' },
],
},
{
name: 'should handle when shard streams undefined',
input: [pb.Workflow.create()],
expected: [],
},
{
name: 'should handle null input',
input: [null],
expected: [],
},
];

test.each(tests.map(Object.values))(
'%s',
(name: string, input: Parameters<typeof getStreams>, expected: ReturnType<typeof getStreams>) => {
expect(getStreams(...input)).toEqual(expected);
}
);
});
43 changes: 43 additions & 0 deletions web/vtadmin/src/util/workflows.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* Copyright 2021 The Vitess Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { vtctldata, vtadmin as pb } from '../proto/vtadmin';

/**
* getStreams returns a flat list of streams across all keyspaces/shards in the workflow.
*/
export const getStreams = <W extends pb.IWorkflow>(workflow: W | null | undefined): vtctldata.Workflow.IStream[] => {
if (!workflow) {
return [];
}

return Object.values(workflow.workflow?.shard_streams || {}).reduce((acc, shardStream) => {
(shardStream.streams || []).forEach((stream) => {
acc.push(stream);
});
return acc;
}, [] as vtctldata.Workflow.IStream[]);
};

/**
* getTimeUpdated returns the `time_updated` timestamp of the most recently
* updated stream in the workflow.
*/
export const getTimeUpdated = <W extends pb.IWorkflow>(workflow: W | null | undefined): number => {
// Note: long-term it may be better to get this from the `vreplication_log` data
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

// added by https://github.com/vitessio/vitess/pull/7831
const timestamps = getStreams(workflow).map((s) => parseInt(`${s.time_updated?.seconds}`, 10));
return Math.max(...timestamps);
};