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.

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

733: Move "Reallocate" button into disk page in DR #737

Merged
merged 2 commits into from
Mar 15, 2024
Merged

733: Move "Reallocate" button into disk page in DR #737

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc0ad55
733: Move "Reallocate" button into disk page in DR
komarevtsev-d Mar 14, 2024
58a2a65
Print physical offset as a raw number
komarevtsev-d Mar 14, 2024
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
13 changes: 7 additions & 6 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void BuildVolumeReallocateButton(
<input
class='btn btn-primary'
type='button'
value='Reallocate'
value='Reallocate volume'
title="Initiate update volume config"
data-toggle='modal'
data-target='#fire-reallocate%s'
Expand Down Expand Up @@ -228,7 +228,7 @@ void TDiskRegistryActor::RenderDevicesWithDetails(
TABLEH() { out << "Block size"; }
TABLEH() { out << "Block count"; }
TABLEH() { out << "Size"; }
TABLEH() { out << "PhysicalOffset"; }
TABLEH() { out << "Physical offset"; }
sharpeye marked this conversation as resolved.
Show resolved Hide resolved
TABLEH() { out << "Transport id"; }
TABLEH() { out << "Rdma endpoint"; }
TABLEH() { out << "DiskId"; }
Expand Down Expand Up @@ -593,6 +593,11 @@ void TDiskRegistryActor::RenderDiskHtmlInfo(
DIV() { out << "Acquire in progress"; }
}

DIV()
{
BuildVolumeReallocateButton(out, TabletID(), id);
}

const bool isNonrepl = info.Replicas.empty();

auto makeHeaderCells = [&] (const ui32 replicaNo) {
Expand Down Expand Up @@ -821,7 +826,6 @@ void TDiskRegistryActor::RenderDiskList(IOutputStream& out) const
TABLEH() { out << "Disk"; }
TABLEH() { out << "State"; }
TABLEH() { out << "State Timestamp"; }
TABLEH() { out << "Action"; }
}
}

Expand All @@ -833,9 +837,6 @@ void TDiskRegistryActor::RenderDiskList(IOutputStream& out) const
TABLED() { DumpDiskLink(out, TabletID(), id); }
TABLED() { DumpDiskState(out, diskInfo.State); }
TABLED() { out << diskInfo.StateTs; }
TABLED() {
BuildVolumeReallocateButton(out, TabletID(), id);
}
}
}
}
Expand Down