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

issue-2917: don't discard Disk Agent stats with unknown devices #2919

Merged
merged 2 commits into from
Jan 27, 2025
+91 −27
Merged

issue-2917: don't discard Disk Agent stats with unknown devices #2919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67d6d13
issue-2917: ignore unknown devices when updating DiskAgent counters
sharpeye Jan 23, 2025
84379a2
tweak error message
sharpeye Jan 24, 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
22 changes: 7 additions & 15 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3960,26 +3960,18 @@ NProto::TError TDiskRegistryState::UpdateAgentCounters(
for (const auto& device: stats.GetDeviceStats()) {
const auto& uuid = device.GetDeviceUUID();

const bool deviceIsUnknown = std::ranges::any_of(
agent->GetUnknownDevices(),
[&uuid](const NProto::TDeviceConfig& device)
{ return device.GetDeviceUUID() == uuid; });
if (deviceIsUnknown) {
return MakeError(
S_FALSE,
TStringBuilder() << "Device: \"" << uuid << "\" is unknown");
const NProto::TDeviceConfig* knownDevice = DeviceList.FindDevice(uuid);
if (!knownDevice) {
continue;
}

const NProto::TDeviceConfig* knownDevice = DeviceList.FindDevice(uuid);
if (!knownDevice || stats.GetNodeId() != knownDevice->GetNodeId()) {
if (stats.GetNodeId() != knownDevice->GetNodeId()) {
return MakeError(
E_ARGUMENT,
TStringBuilder()
sharpeye marked this conversation as resolved.
Show resolved Hide resolved
<< "Unexpected device. DeviceId: \"" << uuid
<< "\" Sender node id: " << stats.GetNodeId()
<< " Found node id: "
<< (knownDevice ? ToString(knownDevice->GetNodeId())
: "null"));
<< "Unexpected device. DeviceId: " << uuid.Quote()
<< " Sender node id: " << stats.GetNodeId()
<< " Found node id: " << knownDevice->GetNodeId());
}
}

Expand Down
2 changes: 1 addition & 1 deletion cloud/blockstore/libs/storage/disk_registry/disk_registry_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ class TDiskRegistryState
}

TVector<TString> CollectBrokenDevices(const NProto::TAgentStats& stats) const;
NProto::TError UpdateAgentCounters(const NProto::TAgentStats& source);
NProto::TError UpdateAgentCounters(const NProto::TAgentStats& stats);
void PublishCounters(TInstant now);

void DeleteDiskStateChanges(
Expand Down
94 changes: 83 additions & 11 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_state_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,10 +1852,11 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)
});

auto config1 = AgentConfig(1000, {
Device("dev-1", "uuid-1", "rack-1"),
Device("dev-1", "uuid-1.1"),
});
auto config2 = AgentConfig(1001, {
Device("dev-2", "uuid-2", "rack-2"),
Device("dev-1", "uuid-2.1"),
Device("dev-3", "uuid-2.3"),
});

auto monitoring = CreateMonitoringServiceStub();
Expand All @@ -1865,9 +1866,16 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)

TDiskRegistryState state = TDiskRegistryStateBuilder()
.With(diskRegistryGroup)
.WithConfig({ config1 })
.WithConfig({ config1, config2 })
.Build();

config2 = AgentConfig(1001, {
Device("dev-1", "uuid-2.1"),
// add an unknown device to #1001
Device("dev-2", "uuid-2.2"),
Device("dev-3", "uuid-2.3"),
});

executor.WriteTx([&] (TDiskRegistryDatabase db) {
UNIT_ASSERT_SUCCESS(RegisterAgent(state, db, config1));
UNIT_ASSERT_SUCCESS(RegisterAgent(state, db, config2));
Expand All @@ -1877,9 +1885,9 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)

{
NProto::TAgentStats stats;
stats.SetNodeId(1000);
stats.SetNodeId(1001);
auto* d = stats.AddDeviceStats();
d->SetDeviceUUID("garbage");
d->SetDeviceUUID("uuid-1.1"); // uuid-1.1 belongs to agent-1000

auto error = state.UpdateAgentCounters(stats);
UNIT_ASSERT_VALUES_EQUAL(E_ARGUMENT, error.GetCode());
Expand All @@ -1888,14 +1896,78 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)
{
NProto::TAgentStats stats;
stats.SetNodeId(1001);
auto* d = stats.AddDeviceStats();
d->SetDeviceUUID("uuid-2");

{
auto* d = stats.AddDeviceStats();
d->SetDeviceUUID("uuid-2.1");
d->SetDeviceName("dev-1");
d->SetBytesRead(4_KB);
d->SetNumReadOps(1);
}

{
auto* d = stats.AddDeviceStats();
d->SetDeviceUUID("uuid-2.2");
d->SetDeviceName("dev-2");
d->SetBytesRead(8_KB);
d->SetNumReadOps(2);
}

{
auto* d = stats.AddDeviceStats();
d->SetDeviceUUID("uuid-2.3");
d->SetDeviceName("dev-3");
d->SetBytesRead(12_KB);
d->SetNumReadOps(3);
}

auto error = state.UpdateAgentCounters(stats);
UNIT_ASSERT_VALUES_EQUAL(S_FALSE, error.GetCode());
UNIT_ASSERT_VALUES_EQUAL(S_OK, error.GetCode());
}

state.PublishCounters(Now());

UNIT_ASSERT(diskRegistryGroup->FindSubgroup("agent", "agent-1000"));

auto counters = diskRegistryGroup->FindSubgroup("agent", "agent-1001");
UNIT_ASSERT(counters);

auto totalReadCount = counters->FindCounter("ReadCount");
UNIT_ASSERT(totalReadCount);
UNIT_ASSERT_VALUES_EQUAL(4, totalReadCount->Val());

auto totalReadBytes = counters->FindCounter("ReadBytes");
UNIT_ASSERT(totalReadBytes);
UNIT_ASSERT_VALUES_EQUAL(16_KB, totalReadBytes->Val());

{
auto device = counters->FindSubgroup("device", "agent-1001:dev-1");
UNIT_ASSERT(device);

auto readCount = device->FindCounter("ReadCount");
UNIT_ASSERT(readCount);
UNIT_ASSERT_VALUES_EQUAL(1, readCount->Val());

auto readBytes = device->FindCounter("ReadBytes");
UNIT_ASSERT(readBytes);
UNIT_ASSERT_VALUES_EQUAL(4_KB, readBytes->Val());
}

// no metrics for the unknown device
UNIT_ASSERT(!counters->FindSubgroup("device", "agent-1001:dev-2"));

{
auto device = counters->FindSubgroup("device", "agent-1001:dev-3");
UNIT_ASSERT(device);

auto readCount = device->FindCounter("ReadCount");
UNIT_ASSERT(readCount);
UNIT_ASSERT_VALUES_EQUAL(3, readCount->Val());

auto readBytes = device->FindCounter("ReadBytes");
UNIT_ASSERT(readBytes);
UNIT_ASSERT_VALUES_EQUAL(12_KB, readBytes->Val());
}
}

Y_UNIT_TEST(ShouldRemoveAgentWithSameId)
Expand Down Expand Up @@ -12160,9 +12232,8 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)
device.SetId(leakedSuspendedDevice);
db.UpdateSuspendedDevice(device);
db.AddAutomaticallyReplacedDevice(
TAutomaticallyReplacedDeviceInfo{
leakedAutomaticallyReplacedDevice,
Now()});
{.DeviceId = leakedAutomaticallyReplacedDevice,
.ReplacementTs = Now()});
});

// Register agent.
Expand Down Expand Up @@ -12248,4 +12319,5 @@ Y_UNIT_TEST_SUITE(TDiskRegistryStateTest)
});
}
}

} // namespace NCloud::NBlockStore::NStorage
Loading