-
Notifications
You must be signed in to change notification settings - Fork 17
feat: vdisks in 2 rows #1758
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
Merged
Merged
feat: vdisks in 2 rows #1758
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
38969b6
feat: vdisks in 2 rows
astandrik ada29cd
chore: use mocks
astandrik 3bceb22
rm overflow
astandrik e3559bc
Merge branch 'main' into astandrik.vdisks-in-2-rows-730
astandrik 74909ea
fix: review fixes
astandrik aec3f14
fix: lint
astandrik af105a6
Merge branch 'main' into astandrik.vdisks-in-2-rows-730
astandrik 059c9b2
fix: delete mocks
astandrik 48f3d6f
fix: rm newline
astandrik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| import {EFlag} from '../../types/api/enums'; | ||
| import type { | ||
| TEndpoint, | ||
| TNodeInfo, | ||
| TNodesInfo, | ||
| TPoolStats, | ||
| TSystemStateInfo, | ||
| } from '../../types/api/nodes'; | ||
| import {TPDiskState} from '../../types/api/pdisk'; | ||
| import {EVDiskState} from '../../types/api/vdisk'; | ||
|
|
||
| // Different disk sizes to simulate variety (in bytes) | ||
| const DISK_SIZES = [ | ||
| '68719476736', // 64 GB | ||
| '137438953472', // 128 GB | ||
| '274877906944', // 256 GB | ||
| '549755813888', // 512 GB | ||
| '1099511627776', // 1 TB | ||
| ]; | ||
|
|
||
| const getRandomDiskSize = () => DISK_SIZES[Math.floor(Math.random() * DISK_SIZES.length)]; | ||
|
|
||
| const generatePoolStats = (count = 5): TPoolStats[] => { | ||
| const poolNames = ['System', 'User', 'Batch', 'IO', 'IC'] as const; | ||
| return poolNames.slice(0, count).map((Name) => ({ | ||
| Name, | ||
| Usage: Math.random() * 0.02, | ||
| Threads: Math.floor(Math.random() * 3) + 1, | ||
| })); | ||
| }; | ||
|
|
||
| const generateEndpoints = (): TEndpoint[] => [ | ||
| {Name: 'ic', Address: ':19001'}, | ||
| {Name: 'http-mon', Address: ':8765'}, | ||
| {Name: 'grpcs', Address: ':2135'}, | ||
| {Name: 'grpc', Address: ':2136'}, | ||
| ]; | ||
|
|
||
| const generateSystemState = (nodeId: number): TSystemStateInfo => ({ | ||
| StartTime: '1734358137851', | ||
| ChangeTime: '1734358421375', | ||
| LoadAverage: [3.381347656, 2.489257813, 1.279296875], | ||
| NumberOfCpus: 8, | ||
| SystemState: EFlag.Green, | ||
| NodeId: nodeId, | ||
| Host: `localhost-${nodeId}`, | ||
| Version: 'main.95ce0df', | ||
| PoolStats: generatePoolStats(), | ||
| Endpoints: generateEndpoints(), | ||
| Roles: ['Bootstrapper', 'StateStorage', 'StateStorageBoard', 'SchemeBoard', 'Storage'], | ||
| MemoryLimit: '2147483648', | ||
| MaxDiskUsage: 0.002349853516, | ||
| Location: { | ||
| DataCenter: '1', | ||
| Rack: '1', | ||
| Unit: '1', | ||
| }, | ||
| TotalSessions: 0, | ||
| CoresUsed: 0.07583969556, | ||
| CoresTotal: 8, | ||
| }); | ||
|
|
||
| const generatePDisk = (nodeId: number, pdiskId: number, totalSize = '68719476736') => ({ | ||
| PDiskId: pdiskId, | ||
| ChangeTime: '1734358142074', | ||
| Path: `/ydb_data/pdisk${pdiskId}l3ki78no.data`, | ||
| Guid: pdiskId.toString(), | ||
| Category: '0', | ||
| TotalSize: totalSize, | ||
| AvailableSize: (Number(totalSize) * 0.9).toString(), // 90% available by default | ||
| State: TPDiskState.Normal, | ||
| NodeId: nodeId, | ||
| Device: EFlag.Green, | ||
| Realtime: EFlag.Green, | ||
| SerialNumber: '', | ||
| SystemSize: '213909504', | ||
| LogUsedSize: '35651584', | ||
| LogTotalSize: '68486692864', | ||
| EnforcedDynamicSlotSize: '22817013760', | ||
| }); | ||
|
|
||
| const generateVDisk = (nodeId: number, vdiskId: number, pdiskId: number) => ({ | ||
| VDiskId: { | ||
| GroupID: vdiskId, | ||
| GroupGeneration: 1, | ||
| Ring: 0, | ||
| Domain: 0, | ||
| VDisk: 0, | ||
| }, | ||
| ChangeTime: '1734358420919', | ||
| PDiskId: pdiskId, | ||
| VDiskSlotId: vdiskId, | ||
| Guid: '1', | ||
| Kind: '0', | ||
| NodeId: nodeId, | ||
| VDiskState: EVDiskState.OK, | ||
| DiskSpace: EFlag.Green, | ||
| SatisfactionRank: { | ||
| FreshRank: { | ||
| Flag: EFlag.Green, | ||
| }, | ||
| LevelRank: { | ||
| Flag: EFlag.Green, | ||
| }, | ||
| }, | ||
| Replicated: true, | ||
| ReplicationProgress: 1, | ||
| ReplicationSecondsRemaining: 0, | ||
| AllocatedSize: '0', | ||
| AvailableSize: '22817013760', | ||
| HasUnreadableBlobs: false, | ||
| IncarnationGuid: '11528832187803248876', | ||
| InstanceGuid: '14836434871903384493', | ||
| FrontQueues: EFlag.Green, | ||
| StoragePoolName: 'static', | ||
| ReadThroughput: '0', | ||
| WriteThroughput: '420', | ||
| }); | ||
|
|
||
| interface NodeGeneratorOptions { | ||
| maxVdisksPerPDisk?: number; | ||
| maxPdisks?: number; | ||
| } | ||
|
|
||
| const DEFAULT_OPTIONS: NodeGeneratorOptions = { | ||
| maxVdisksPerPDisk: 3, | ||
| maxPdisks: 4, | ||
| }; | ||
|
|
||
| const generateNode = (nodeId: number, options: NodeGeneratorOptions = {}): TNodeInfo => { | ||
| const maxPdisks = options.maxPdisks ?? DEFAULT_OPTIONS.maxPdisks!; | ||
| const maxVdisksPerPDisk = options.maxVdisksPerPDisk ?? DEFAULT_OPTIONS.maxVdisksPerPDisk!; | ||
|
|
||
| // Generate a random number of pdisks up to maxPdisks | ||
| const pdisksCount = Math.floor(Math.random() * maxPdisks) + 1; | ||
|
|
||
| // For each pdisk, generate a random number of vdisks up to maxVdisksPerPDisk | ||
| const pdiskVdisksCounts = Array.from({length: pdisksCount}, () => | ||
| Math.floor(Math.random() * maxVdisksPerPDisk), | ||
| ); | ||
| const totalVdisks = pdiskVdisksCounts.reduce((sum: number, count: number) => sum + count, 0); | ||
|
|
||
| return { | ||
| NodeId: nodeId, | ||
| UptimeSeconds: 284, | ||
| CpuUsage: 0.00947996, | ||
| DiskSpaceUsage: 0.234985, | ||
| SystemState: generateSystemState(nodeId), | ||
| PDisks: Array.from({length: pdisksCount}, (_, i) => | ||
| generatePDisk(nodeId, i + 1, getRandomDiskSize()), | ||
| ), | ||
| VDisks: Array.from({length: totalVdisks}, (_, i) => { | ||
| // Find which pdisk this vdisk belongs to based on the distribution | ||
| let pdiskIndex = 0; | ||
| let vdiskCount = pdiskVdisksCounts[0]; | ||
| while (i >= vdiskCount && pdiskIndex < pdisksCount - 1) { | ||
| pdiskIndex++; | ||
| vdiskCount += pdiskVdisksCounts[pdiskIndex]; | ||
| } | ||
| return generateVDisk(nodeId, i, pdiskIndex + 1); | ||
| }), | ||
| }; | ||
| }; | ||
|
|
||
| export const generateNodes = (count = 1, options?: NodeGeneratorOptions): TNodesInfo => { | ||
| const nodes = Array.from({length: count}, (_, i) => generateNode(i + 1, options)); | ||
|
|
||
| // Calculate MaximumSlotsPerDisk as the maximum number of vdisks on any pdisk | ||
| let maxSlotsPerDisk = 0; | ||
| nodes.forEach((node) => { | ||
| if (node.VDisks) { | ||
| const pdiskVdiskCounts = new Map<number, number>(); | ||
| node.VDisks.forEach((vdisk) => { | ||
| if (typeof vdisk.PDiskId === 'number') { | ||
| const count = (pdiskVdiskCounts.get(vdisk.PDiskId) || 0) + 1; | ||
| pdiskVdiskCounts.set(vdisk.PDiskId, count); | ||
| maxSlotsPerDisk = Math.max(maxSlotsPerDisk, count); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| return { | ||
| TotalNodes: count.toString(), | ||
| FoundNodes: count.toString(), | ||
| Nodes: nodes, | ||
| MaximumSlotsPerDisk: maxSlotsPerDisk.toString(), | ||
| }; | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for test only (will delete before merge)