Skip to content

Commit cf9d0c4

Browse files
authored
Merge branch 'main' into astandrik.very-bad-performance-1472
2 parents 37e02c4 + cabcb5c commit cf9d0c4

File tree

22 files changed

+343
-85
lines changed

22 files changed

+343
-85
lines changed

LICENSE

Lines changed: 201 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,201 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2021 YANDEX LLC
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in
13-
all copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2021 YANDEX LLC
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

src/components/PDiskInfo/PDiskInfo.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import {formatStorageValuesToGb} from '../../utils/dataFormatters/dataFormatters
99
import {createPDiskDeveloperUILink} from '../../utils/developerUI/developerUI';
1010
import type {PreparedPDisk} from '../../utils/disks/types';
1111
import {useTypedSelector} from '../../utils/hooks';
12-
import {EntityStatus} from '../EntityStatus/EntityStatus';
1312
import type {InfoViewerItem} from '../InfoViewer';
1413
import {InfoViewer} from '../InfoViewer/InfoViewer';
1514
import {LinkWithIcon} from '../LinkWithIcon/LinkWithIcon';
1615
import {ProgressViewer} from '../ProgressViewer/ProgressViewer';
16+
import {StatusIcon} from '../StatusIcon/StatusIcon';
1717

1818
import {pDiskInfoKeyset} from './i18n';
1919

@@ -92,13 +92,13 @@ function getPDiskInfo<T extends PreparedPDisk>({
9292
if (valueIsDefined(Device)) {
9393
statusInfo.push({
9494
label: pDiskInfoKeyset('device'),
95-
value: <EntityStatus status={Device} />,
95+
value: <StatusIcon status={Device} />,
9696
});
9797
}
9898
if (valueIsDefined(Realtime)) {
9999
statusInfo.push({
100100
label: pDiskInfoKeyset('realtime'),
101-
value: <EntityStatus status={Realtime} />,
101+
value: <StatusIcon status={Realtime} />,
102102
});
103103
}
104104

src/components/StatusIcon/StatusIcon.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
&__status-color,
3939
&__status-icon {
40+
display: inline-flex;
4041
flex-shrink: 0;
4142

4243
border-radius: 3px;

src/components/StorageGroupInfo/StorageGroupInfo.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {valueIsDefined} from '../../utils';
55
import {formatStorageValuesToGb} from '../../utils/dataFormatters/dataFormatters';
66
import {formatToMs} from '../../utils/timeParsers';
77
import {bytesToSpeed} from '../../utils/utils';
8-
import {EntityStatus} from '../EntityStatus/EntityStatus';
98
import {InfoViewer} from '../InfoViewer';
109
import type {InfoViewerProps} from '../InfoViewer/InfoViewer';
1110
import {ProgressViewer} from '../ProgressViewer/ProgressViewer';
11+
import {StatusIcon} from '../StatusIcon/StatusIcon';
1212

1313
import {storageGroupInfoKeyset} from './i18n';
1414

@@ -70,7 +70,7 @@ export function StorageGroupInfo({data, className, ...infoViewerProps}: StorageG
7070
if (valueIsDefined(Overall)) {
7171
storageGroupInfoFirstColumn.push({
7272
label: storageGroupInfoKeyset('overall'),
73-
value: <EntityStatus status={Overall} />,
73+
value: <StatusIcon status={Overall} />,
7474
});
7575
}
7676
if (valueIsDefined(State)) {
@@ -113,13 +113,13 @@ export function StorageGroupInfo({data, className, ...infoViewerProps}: StorageG
113113
if (valueIsDefined(DiskSpace)) {
114114
storageGroupInfoSecondColumn.push({
115115
label: storageGroupInfoKeyset('disk-space'),
116-
value: <EntityStatus status={DiskSpace} />,
116+
value: <StatusIcon status={DiskSpace} />,
117117
});
118118
}
119119
if (valueIsDefined(Latency)) {
120120
storageGroupInfoSecondColumn.push({
121121
label: storageGroupInfoKeyset('latency'),
122-
value: <EntityStatus status={Latency} />,
122+
value: <StatusIcon status={Latency} />,
123123
});
124124
}
125125
if (valueIsDefined(LatencyPutTabletLogMs)) {

src/components/VDiskInfo/VDiskInfo.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {InfoViewer} from '../InfoViewer';
1515
import type {InfoViewerProps} from '../InfoViewer/InfoViewer';
1616
import {LinkWithIcon} from '../LinkWithIcon/LinkWithIcon';
1717
import {ProgressViewer} from '../ProgressViewer/ProgressViewer';
18+
import {StatusIcon} from '../StatusIcon/StatusIcon';
1819

1920
import {vDiskInfoKeyset} from './i18n';
2021

@@ -106,25 +107,25 @@ export function VDiskInfo<T extends PreparedVDisk>({
106107
if (valueIsDefined(DiskSpace)) {
107108
vdiskInfo.push({
108109
label: vDiskInfoKeyset('space-status'),
109-
value: <EntityStatus status={DiskSpace} />,
110+
value: <StatusIcon status={DiskSpace} />,
110111
});
111112
}
112113
if (valueIsDefined(SatisfactionRank?.FreshRank?.Flag)) {
113114
vdiskInfo.push({
114115
label: vDiskInfoKeyset('fresh-rank-satisfaction'),
115-
value: <EntityStatus status={SatisfactionRank?.FreshRank?.Flag} />,
116+
value: <StatusIcon status={SatisfactionRank?.FreshRank?.Flag} />,
116117
});
117118
}
118119
if (valueIsDefined(SatisfactionRank?.LevelRank?.Flag)) {
119120
vdiskInfo.push({
120121
label: vDiskInfoKeyset('level-rank-satisfaction'),
121-
value: <EntityStatus status={SatisfactionRank?.LevelRank?.Flag} />,
122+
value: <StatusIcon status={SatisfactionRank?.LevelRank?.Flag} />,
122123
});
123124
}
124125
if (valueIsDefined(FrontQueues)) {
125126
vdiskInfo.push({
126127
label: vDiskInfoKeyset('front-queues'),
127-
value: <EntityStatus status={FrontQueues} />,
128+
value: <StatusIcon status={FrontQueues} />,
128129
});
129130
}
130131
if (valueIsDefined(HasUnreadableBlobs)) {

src/components/nodesColumns/columns.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ export function getMemoryColumn<
107107
/>
108108
),
109109
align: DataTable.LEFT,
110-
width: 140,
111-
resizeMinWidth: 140,
110+
width: 170,
111+
resizeMinWidth: 170,
112112
};
113113
}
114114
export function getSharedCacheUsageColumn<
@@ -126,8 +126,8 @@ export function getSharedCacheUsageColumn<
126126
/>
127127
),
128128
align: DataTable.LEFT,
129-
width: 140,
130-
resizeMinWidth: 140,
129+
width: 170,
130+
resizeMinWidth: 170,
131131
};
132132
}
133133
export function getCpuColumn<T extends {PoolStats?: TPoolStats[]}>(): Column<T> {
@@ -162,8 +162,8 @@ export function getLoadAverageColumn<T extends {LoadAveragePercents?: number[]}>
162162
/>
163163
),
164164
align: DataTable.LEFT,
165-
width: 140,
166-
resizeMinWidth: 140,
165+
width: 170,
166+
resizeMinWidth: 170,
167167
};
168168
}
169169
// The same as loadAverage, but more compact

src/containers/Clusters/columns.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
146146
{
147147
name: COLUMNS_NAMES.NODES,
148148
header: COLUMNS_TITLES[COLUMNS_NAMES.NODES],
149-
resizeMinWidth: 140,
149+
resizeMinWidth: 170,
150150
defaultOrder: DataTable.DESCENDING,
151151
sortAccessor: ({cluster = {}}) => {
152152
const {NodesTotal = 0} = cluster;
@@ -166,7 +166,7 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
166166
{
167167
name: COLUMNS_NAMES.LOAD,
168168
header: COLUMNS_TITLES[COLUMNS_NAMES.LOAD],
169-
resizeMinWidth: 140,
169+
resizeMinWidth: 170,
170170
defaultOrder: DataTable.DESCENDING,
171171
sortAccessor: ({cluster}) => {
172172
return cluster?.NumberOfCpus;
@@ -184,7 +184,7 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
184184
{
185185
name: COLUMNS_NAMES.STORAGE,
186186
header: COLUMNS_TITLES[COLUMNS_NAMES.STORAGE],
187-
resizeMinWidth: 140,
187+
resizeMinWidth: 170,
188188
defaultOrder: DataTable.DESCENDING,
189189
sortAccessor: ({cluster}) => {
190190
return Number(cluster?.StorageTotal);

0 commit comments

Comments
 (0)