Skip to content

Commit d2897ba

Browse files
committed
issue-2725: change test suite name and correct issues
1 parent 0d52ebb commit d2897ba

File tree

6 files changed

+113
-121
lines changed

6 files changed

+113
-121
lines changed

cloud/blockstore/libs/storage/volume/volume_actor_acquire.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ void TVolumeActor::HandleDevicesAcquireFinished(
377377
const TEvVolumePrivate::TEvDevicesAcquireFinished::TPtr& ev,
378378
const TActorContext& ctx)
379379
{
380-
HandleDevicesAcquireFinishedImpl(ev->Get()->Error, ctx);
380+
HandleDevicesAcquireFinishedImpl(ev->Get()->GetError(), ctx);
381381
}
382382

383383
} // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/volume/volume_actor_release.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ using namespace NKikimr::NTabletFlatExecutor;
1212

1313
namespace {
1414

15+
////////////////////////////////////////////////////////////////////////////////
16+
1517
class TReleaseDevicesActor final
1618
: public TActorBootstrapped<TReleaseDevicesActor>
1719
{
@@ -276,7 +278,7 @@ void TVolumeActor::HandleDevicesReleasedFinished(
276278
const TEvVolumePrivate::TEvDevicesReleaseFinished::TPtr& ev,
277279
const NActors::TActorContext& ctx)
278280
{
279-
HandleDevicesReleasedFinishedImpl(ev->Get()->Error, ctx);
281+
HandleDevicesReleasedFinishedImpl(ev->Get()->GetError(), ctx);
280282
}
281283

282284
} // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/volume/volume_events_private.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ struct TEvVolumePrivate
314314

315315
struct TDevicesAcquireFinished
316316
{
317-
NProto::TError Error;
318317
};
319318

320319
//
@@ -323,7 +322,6 @@ struct TEvVolumePrivate
323322

324323
struct TDevicesReleaseFinished
325324
{
326-
NProto::TError Error;
327325
};
328326

329327
//

cloud/blockstore/libs/storage/volume/volume_state.cpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,31 @@ const THashMultiMap<TActorId, TString>& TVolumeState::GetPipeServerId2ClientId()
811811
return ClientIdsByPipeServerId;
812812
}
813813

814+
TVector<NProto::TDeviceConfig>
815+
TVolumeState::GetAllDevicesForAcquireRelease() const
816+
{
817+
const size_t allDevicesCount =
818+
((Meta.ReplicasSize() + 1) * Meta.DevicesSize()) +
819+
GetMeta().MigrationsSize();
820+
821+
TVector<NProto::TDeviceConfig> resultDevices;
822+
resultDevices.reserve(allDevicesCount);
823+
824+
for (const auto& device: Meta.GetDevices()) {
825+
resultDevices.emplace_back(device);
826+
}
827+
for (const auto& replica: Meta.GetReplicas()) {
828+
for (const auto& device: replica.GetDevices()) {
829+
resultDevices.emplace_back(device);
830+
}
831+
}
832+
for (const auto& migration: Meta.GetMigrations()) {
833+
resultDevices.emplace_back(migration.GetTargetDevice());
834+
}
835+
836+
return resultDevices;
837+
}
838+
814839
bool TVolumeState::CanPreemptClient(
815840
const TString& oldClientId,
816841
TInstant referenceTimestamp,

cloud/blockstore/libs/storage/volume/volume_state.h

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -724,29 +724,7 @@ class TVolumeState
724724
return Meta.GetResyncNeeded();
725725
}
726726

727-
TVector<NProto::TDeviceConfig> GetAllDevicesForAcquireRelease()
728-
{
729-
const size_t allDevicesCount =
730-
((Meta.ReplicasSize() + 1) * Meta.DevicesSize()) +
731-
GetMeta().MigrationsSize();
732-
733-
TVector<NProto::TDeviceConfig> resultDevices;
734-
resultDevices.reserve(allDevicesCount);
735-
736-
for (const auto& device: Meta.GetDevices()) {
737-
resultDevices.emplace_back(device);
738-
}
739-
for (const auto& replica: Meta.GetReplicas()) {
740-
for (const auto& device: replica.GetDevices()) {
741-
resultDevices.emplace_back(device);
742-
}
743-
}
744-
for (const auto& migration: Meta.GetMigrations()) {
745-
resultDevices.emplace_back(migration.GetTargetDevice());
746-
}
747-
748-
return resultDevices;
749-
}
727+
TVector<NProto::TDeviceConfig> GetAllDevicesForAcquireRelease() const;
750728

751729
private:
752730
bool CanPreemptClient(

0 commit comments

Comments
 (0)