Skip to content

fix(VDiskPage): use vdisk_id for api requests if possible #3001

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 23, 2025
Merged

fix(VDiskPage): use vdisk_id for api requests if possible #3001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d93e056
fix(VDiskPage): use vdisk_id for api requests if possible
Raubzeug Oct 23, 2025
9f10e3f
fix: review
Raubzeug Oct 23, 2025
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: 3 additions & 2 deletions src/containers/Header/breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Database as DatabaseIcon,
HardDrive as StorageNodeIcon,
} from '@gravity-ui/icons';
import {isNil} from 'lodash';

import {TabletIcon} from '../../components/TabletIcon/TabletIcon';
import routes, {getPDiskPagePath, getStorageGroupPath} from '../../routes';
Expand Down Expand Up @@ -172,13 +173,13 @@ const getStorageGroupBreadcrumbs: GetBreadcrumbs<StorageGroupBreadcrumbsOptions>
: getClusterBreadcrumbs(options, query);

let text = headerKeyset('breadcrumbs.storageGroup');
if (groupId) {
if (!isNil(groupId)) {
text += ` ${groupId}`;
}

const lastItem = {
text,
link: groupId ? getStorageGroupPath(groupId, {database}) : undefined,
link: isNil(groupId) ? undefined : getStorageGroupPath(groupId, {database}),
};
breadcrumbs.push(lastItem);

Expand Down
38 changes: 23 additions & 15 deletions src/containers/VDiskPage/VDiskPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@ export function VDiskPage() {
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
const newDiskApiAvailable = useDiskPagesAvailable();

const [{nodeId, pDiskId, vDiskId: vDiskIdParam, activeTab, database: databaseParam}] =
useQueryParams({
nodeId: StringParam,
pDiskId: StringParam,
vDiskId: StringParam,
activeTab: StringParam,
database: StringParam,
});
const [{nodeId, vDiskId: vDiskIdParam, activeTab, database: databaseParam}] = useQueryParams({
nodeId: StringParam,
vDiskId: StringParam,
activeTab: StringParam,
database: StringParam,
});
const database = databaseParam ?? undefined;

const vDiskTab = vDiskTabSchema.parse(activeTab);
Expand Down Expand Up @@ -107,8 +105,17 @@ export function VDiskPage() {
}, [dispatch, database, vDiskData?.VDiskId?.GroupID, vDiskData?.StringifiedId]);

const loading = isFetching && vDiskData === undefined;
const {NodeHost, NodeId, NodeType, NodeDC, PDiskId, PDiskType, Severity, VDiskId} =
vDiskData || {};
const {
NodeHost,
NodeId,
NodeType,
NodeDC,
PDiskId,
PDiskType,
Severity,
VDiskId,
StringifiedId,
} = vDiskData || {};

const {GroupID, GroupGeneration, Ring, Domain, VDisk} =
VDiskId || (!loading && getVDiskIdFromString(vDiskIdParam)) || {};
Expand Down Expand Up @@ -169,8 +176,8 @@ export function VDiskPage() {
? `${vDiskPageKeyset('vdisk')} ${vDiskSlotId}`
: vDiskPageKeyset('vdisk');

const pDiskPagePart = pDiskId
? `${vDiskPageKeyset('pdisk')} ${pDiskId}`
const pDiskPagePart = PDiskId
? `${vDiskPageKeyset('pdisk')} ${PDiskId}`
: vDiskPageKeyset('pdisk');

const nodePagePart = NodeHost ? NodeHost : vDiskPageKeyset('node');
Expand Down Expand Up @@ -275,8 +282,9 @@ export function VDiskPage() {
<VDiskTablets
scrollContainerRef={containerRef}
nodeId={nodeId ?? undefined}
pDiskId={pDiskId ?? undefined}
pDiskId={PDiskId}
vDiskSlotId={vDiskSlotId ?? undefined}
vDiskId={StringifiedId}
className={vDiskPageCn('tablets-content')}
/>
);
Expand All @@ -293,12 +301,12 @@ export function VDiskPage() {
database={database}
groupId={GroupID}
nodeId={nodeId ?? undefined}
pDiskId={pDiskId ?? undefined}
pDiskId={PDiskId}
scrollContainerRef={containerRef}
viewContext={{
groupId: GroupID?.toString(),
nodeId: nodeId?.toString(),
pDiskId: pDiskId?.toString(),
pDiskId: PDiskId?.toString(),
vDiskSlotId: vDiskSlotId?.toString(),
}}
/>
Expand Down
25 changes: 17 additions & 8 deletions src/containers/VDiskPage/VDiskTablets/VDiskTablets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {isNil} from 'lodash';
import {PageError} from '../../../components/Errors/PageError/PageError';
import {ResizeableDataTable} from '../../../components/ResizeableDataTable/ResizeableDataTable';
import {TableWithControlsLayout} from '../../../components/TableWithControlsLayout/TableWithControlsLayout';
import {useBlobIndexStatWithVdiskId} from '../../../store/reducers/capabilities/hooks';
import {vDiskApi} from '../../../store/reducers/vdisk/vdisk';
import type {VDiskBlobIndexItem} from '../../../types/api/vdiskBlobIndex';
import {DEFAULT_TABLE_SETTINGS} from '../../../utils/constants';
Expand All @@ -22,6 +23,7 @@ const columns = getColumns();

interface VDiskTabletsProps {
nodeId?: string | number;
vDiskId?: string;
pDiskId?: string | number;
vDiskSlotId?: string | number;
className?: string;
Expand All @@ -32,19 +34,26 @@ export function VDiskTablets({
nodeId,
pDiskId,
vDiskSlotId,
vDiskId,
className,
scrollContainerRef,
}: VDiskTabletsProps) {
const [autoRefreshInterval] = useAutoRefreshInterval();
const useVdiskId = useBlobIndexStatWithVdiskId();

const {currentData, isFetching, error} = vDiskApi.useGetVDiskBlobIndexStatQuery(
!isNil(nodeId) && !isNil(pDiskId) && !isNil(vDiskSlotId)
? {nodeId, pDiskId, vDiskSlotId}
: skipToken,
{
pollingInterval: autoRefreshInterval,
},
);
const params = React.useMemo(() => {
if (useVdiskId && !isNil(vDiskId)) {
return {vDiskId};
}
if (!isNil(nodeId) && !isNil(vDiskSlotId) && !isNil(pDiskId)) {
return {nodeId, pDiskId, vDiskSlotId};
}
return skipToken;
}, [nodeId, pDiskId, vDiskSlotId, vDiskId, useVdiskId]);

const {currentData, isFetching, error} = vDiskApi.useGetVDiskBlobIndexStatQuery(params, {
pollingInterval: autoRefreshInterval,
});

const loading = isFetching && currentData === undefined;

Expand Down
25 changes: 11 additions & 14 deletions src/services/api/viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type {PlanToSvgQueryParams} from '../../store/reducers/planToSvg';
import type {VDiskBlobIndexStatParams} from '../../store/reducers/vdisk/vdisk';
import type {
AccessRightsUpdateRequest,
AvailablePermissionsResponse,
Expand Down Expand Up @@ -548,25 +549,21 @@ export class ViewerAPI extends BaseYdbAPI {
}

getVDiskBlobIndexStat(
{
vDiskSlotId,
pDiskId,
nodeId,
database,
}: {
vDiskSlotId: string | number;
pDiskId: string | number;
nodeId: string | number;
database?: string;
},
{database, ...rest}: VDiskBlobIndexStatParams,
{concurrentId, signal}: AxiosOptions = {},
) {
const params =
'vDiskId' in rest
? {vdisk_id: rest.vDiskId}
: {
node_id: rest.nodeId,
pdisk_id: rest.pDiskId,
vslot_id: rest.vDiskSlotId,
};
return this.get<VDiskBlobIndexResponse>(
this.getPath('/vdisk/blobindexstat'),
{
node_id: nodeId,
pdisk_id: pDiskId,
vslot_id: vDiskSlotId,
...params,
database,
},
{concurrentId, requestConfig: {signal}},
Expand Down
4 changes: 4 additions & 0 deletions src/store/reducers/capabilities/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export const useStorageGroupsHandlerAvailable = () => {
return useGetFeatureVersion('/storage/groups') > 2;
};

export const useBlobIndexStatWithVdiskId = () => {
return useGetFeatureVersion('/vdisk/blobindexstat') > 1;
};

export const useStorageGroupsHandlerHasGrouping = () => {
return useGetFeatureVersion('/storage/groups') > 4;
};
Expand Down
32 changes: 13 additions & 19 deletions src/store/reducers/vdisk/vdisk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ type VDiskDataRequestParams = {
database?: string;
};

type VDiskBlobIndexStatBasicParams =
| {nodeId: string | number; pDiskId: string | number; vDiskSlotId: string | number}
| {vDiskId: string};

export type VDiskBlobIndexStatParams = VDiskBlobIndexStatBasicParams & {
database?: string;
};

export const vDiskApi = api.injectEndpoints({
endpoints: (build) => ({
getVDiskData: build.query({
Expand Down Expand Up @@ -52,25 +60,11 @@ export const vDiskApi = api.injectEndpoints({
],
}),
getVDiskBlobIndexStat: build.query({
queryFn: async (
{
nodeId,
pDiskId,
vDiskSlotId,
database,
}: {
nodeId: string | number;
pDiskId: string | number;
vDiskSlotId: string | number;
database?: string;
},
{signal},
) => {
queryFn: async (params: VDiskBlobIndexStatParams, {signal}) => {
try {
const response = await window.api.viewer.getVDiskBlobIndexStat(
{nodeId, pDiskId, vDiskSlotId, database},
{signal},
);
const response = await window.api.viewer.getVDiskBlobIndexStat(params, {
signal,
});
return {data: response};
} catch (error) {
return {error};
Expand All @@ -80,7 +74,7 @@ export const vDiskApi = api.injectEndpoints({
'All',
{
type: 'VDiskBlobIndexStat',
id: getVDiskSlotBasedId(arg.nodeId, arg.pDiskId, arg.vDiskSlotId),
id: getVDiskSlotBasedId(arg),
},
],
}),
Expand Down
1 change: 1 addition & 0 deletions src/types/api/capabilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export type Capability =
| '/viewer/feature_flags'
| '/viewer/config'
| '/viewer/cluster'
| '/vdisk/blobindexstat'
| '/viewer/nodes'
| '/viewer/acl'
| '/viewer/topic_data';
Expand Down
13 changes: 7 additions & 6 deletions src/utils/disks/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {valueIsDefined} from '..';
import type {VDiskBlobIndexStatParams} from '../../store/reducers/vdisk/vdisk';
import {EFlag} from '../../types/api/enums';
import type {TVDiskStateInfo, TVSlotId} from '../../types/api/vdisk';
import {generateEvaluator} from '../generateEvaluator';
Expand Down Expand Up @@ -47,10 +48,10 @@ export function getPDiskId({
return undefined;
}

export function getVDiskSlotBasedId(
nodeId: string | number,
pDiskId: string | number,
vDiskSlotId: string | number,
) {
return [nodeId, pDiskId, vDiskSlotId].join('-');
export function getVDiskSlotBasedId(params: VDiskBlobIndexStatParams) {
Copy link
Member

@artemmufazalov artemmufazalov Oct 23, 2025

Choose a reason for hiding this comment

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

I'd rename it to something else. Maybe just getVDiskId, vdisk id and slot id are different:

Id: "GroupID - GroupGeneration - Ring - Domain - VDisk"
Slot id: "NodeId - PDiskId - VDiskSlotId"

const parts =
'vDiskId' in params
? [params.vDiskId]
: [params.nodeId, params.pDiskId, params.vDiskSlotId];
return parts.join('-');
}
Loading