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

Jump to bottom

merge to stable-23-3 #878

Merged
merged 5 commits into from
Apr 3, 2024
Merged

merge to stable-23-3 #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b2bb99
issue-539: extract writedata actor into separate location + add TABLE…
debnatkh Mar 21, 2024
4d06116
fix arcadia build: trailing EOL (#808)
debnatkh Mar 22, 2024
05c1688
issue-539: add tablet-side two-stage writes support for scaling throu…
debnatkh Mar 28, 2024
0c5b7d3
issue-539: add service-side two-stage writes support for scaling thro…
debnatkh Apr 2, 2024
6ed6eca
fix cmake build
debnatkh Apr 2, 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
12 changes: 12 additions & 0 deletions cloud/filestore/config/storage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,16 @@ message TStorageConfig
optional uint32 CleanupThresholdAverage = 342;
// Enables the aforementioned threshold.
optional bool NewCleanupEnabled = 343;

// Enables GenerateBlobIds + WriteBlob + AddData instead of WriteBlob
// for writing.
optional bool ThreeStageWriteEnabled = 344;

// When issuing blob ids, the tablet acquires a collect barrier. In order
// to release it in case of a client disconnect, this timeout is used.
optional uint32 GenerateBlobIdsReleaseCollectBarrierTimeout = 345;

// If ThreeStageWriteEnabled is true, writes that exceed this threshold
// will use the three-stage write path. Similar to WriteBlobThreshold
optional uint32 ThreeStageWriteThreshold = 346;
}
2 changes: 1 addition & 1 deletion cloud/filestore/libs/storage/api/service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ namespace NCloud::NFileStore::NStorage {
xxx(ReleaseLock, __VA_ARGS__) \
xxx(TestLock, __VA_ARGS__) \
\
xxx(WriteData, __VA_ARGS__) \
xxx(AllocateData, __VA_ARGS__) \
// FILESTORE_SERVICE_REQUESTS_HANDLE

#define FILESTORE_SERVICE_REQUESTS_NO_HANDLE(xxx, ...) \
xxx(WriteData, __VA_ARGS__) \
xxx(ReadData, __VA_ARGS__) \
// FILESTORE_SERVICE_REQUESTS_NO_HANDLE

Expand Down
8 changes: 8 additions & 0 deletions cloud/filestore/libs/storage/api/tablet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ namespace NCloud::NFileStore::NStorage {
xxx(ChangeStorageConfig, __VA_ARGS__) \
xxx(DescribeData, __VA_ARGS__) \
xxx(DescribeSessions, __VA_ARGS__) \
xxx(GenerateBlobIds, __VA_ARGS__) \
xxx(AddData, __VA_ARGS__) \
// FILESTORE_TABLET_REQUESTS

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -65,6 +67,12 @@ struct TEvIndexTablet
EvDescribeSessionsRequest = EvBegin + 17,
EvDescribeSessionsResponse,

EvGenerateBlobIdsRequest = EvBegin + 19,
EvGenerateBlobIdsResponse,

EvAddDataRequest = EvBegin + 21,
EvAddDataResponse,

EvEnd
};

Expand Down
6 changes: 6 additions & 0 deletions cloud/filestore/libs/storage/core/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,17 @@ namespace {
NCloud::NProto::AUTHORIZATION_IGNORE )\
\
xxx(TwoStageReadEnabled, bool, false )\
xxx(ThreeStageWriteEnabled, bool, false )\
xxx(ThreeStageWriteThreshold, ui32, 64_KB )\
xxx(EntryTimeout, TDuration, TDuration::Zero() )\
xxx(NegativeEntryTimeout, TDuration, TDuration::Zero() )\
xxx(AttrTimeout, TDuration, TDuration::Zero() )\
xxx(MaxOutOfOrderCompactionMapLoadRequestsInQueue, ui32, 5 )\
xxx(MaxBackpressureErrorsBeforeSuicide, ui32, 1000 )\
\
xxx(GenerateBlobIdsReleaseCollectBarrierTimeout, \
TDuration, \
TDuration::Seconds(10) )\
// FILESTORE_STORAGE_CONFIG

#define FILESTORE_DECLARE_CONFIG(name, type, value) \
Expand Down
4 changes: 4 additions & 0 deletions cloud/filestore/libs/storage/core/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ class TStorageConfig
NCloud::NProto::EAuthorizationMode GetAuthorizationMode() const;

bool GetTwoStageReadEnabled() const;
bool GetThreeStageWriteEnabled() const;
ui32 GetThreeStageWriteThreshold() const;
TDuration GetEntryTimeout() const;
TDuration GetNegativeEntryTimeout() const;
TDuration GetAttrTimeout() const;
Expand All @@ -191,6 +193,8 @@ class TStorageConfig

ui32 GetMaxBackpressureErrorsBeforeSuicide() const;

TDuration GetGenerateBlobIdsReleaseCollectBarrierTimeout() const;

void Dump(IOutputStream& out) const;
void DumpHtml(IOutputStream& out) const;
void DumpOverridesHtml(IOutputStream& out) const;
Expand Down
1 change: 1 addition & 0 deletions cloud/filestore/libs/storage/service/CMakeLists.darwin-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ target_sources(filestore-libs-storage-service PRIVATE
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
)
1 change: 1 addition & 0 deletions cloud/filestore/libs/storage/service/CMakeLists.linux-aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ target_sources(filestore-libs-storage-service PRIVATE
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
)
1 change: 1 addition & 0 deletions cloud/filestore/libs/storage/service/CMakeLists.linux-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@ target_sources(filestore-libs-storage-service PRIVATE
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
)
1 change: 1 addition & 0 deletions cloud/filestore/libs/storage/service/CMakeLists.windows-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ target_sources(filestore-libs-storage-service PRIVATE
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
)
Loading