Merge branch 'ydb-platform:main' into prepare-to-ydb-nontransitive-he…

…aders

.clang-format

@@ -179,7 +179,7 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyIndentedWhitespace: 0
-PenaltyReturnTypeOnItsOwnLine: 20000
+PenaltyReturnTypeOnItsOwnLine: 0
 PointerAlignment: Left
 PPIndentWidth:   -1
 QualifierAlignment: Leave

.github/config/muted_ya.txt

@@ -5,6 +5,7 @@ cloud/blockstore/tests/resize-disk *
 cloud/disk_manager/internal/pkg/dataplane/snapshot/storage/tests tests.TestShallowCopySnapshotWithRandomFailure
 cloud/disk_manager/internal/pkg/dataplane/snapshot/storage/tests tests.TestShallowCopySnapshotWithRandomFailure/store_chunks_in_s3
 cloud/disk_manager/internal/pkg/dataplane/snapshot/storage/tests tests.TestShallowCopySnapshotWithRandomFailure/store_chunks_in_ydb
+cloud/disk_manager/internal/pkg/facade/disk_service_nemesis_test tests.TestDiskServiceMigrate*
 cloud/filestore/tests/fio_index_migration/qemu-intrahost-migration-kikimr-nemesis-test *
 cloud/filestore/tests/fio_index_migration/qemu-intrahost-migration-kikimr-test *
 cloud/filestore/tests/fio_index_migration/qemu-intrahost-migration-local-test *

.gitignore

@@ -12,6 +12,9 @@ __pycache__
 *.py[cod]
 *$py.class
 
+# distclang
+.distclang*
+
 # MacOS specific
 .DS_Store
 
@@ -86,6 +89,9 @@ test-results
 
 # IDE files
 *.swp
+.vscode/*
+*.code-workspace
+*.code-workspace.bak
 
 # act files
 .input

CLANG-FORMAT.md

@@ -4,10 +4,14 @@ Use [this](.clang-format) clang-format config to format new and modified code.
 
 ## Install
 
+For VSCode install and use clangd plugin https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd
+
+For other development environments, you should install clang-format-18 manually.
+
 ```
 sudo apt-get install clang-format-18
 ```
 
 Configure the plugin for your favorite code editor to use the [config](.clang-format) to format the code. For VS Code, for example, you can use https://marketplace.visualstudio.com/items?itemName=xaver.clang-format
 
-Note. clang-format searches for the .clang-format configuration file in the directory of the formatted file and in all parent directories. Therefore, no additional settings are required.
+Note. clang-format searches for the .clang-format configuration file in the directory of the formatted file and in all parent directories. Therefore, no additional settings are required.

README.md

@@ -4,6 +4,8 @@ Network Block Device implementation over YDB BlobStorage or over our own storage
 
 ### Quickstart
 
+Follow the instructions [here](VSCODE.md) to generate workspace and install the necessary plugins.
+
 Follow the instructions [here](example/README.md) to build and run NBS on your machine and to attach an NBS-based disk via NBD. NBS-based disks can be attached via vhost-user-blk as well.
 
 Follow the instructions [here](CLANG-FORMAT.md) to install clang-format for formatting the code.

VSCODE.md

@@ -0,0 +1,28 @@
+## Visual Studio Code
+
+### Generate workspace
+
+Run vscode_generate_workspace.sh to generate a workspace in the root of the repository.
+```
+.vscode_generate_workspace.sh
+```
+
+### Open workspace
+
+Open workspace from menu "Open workspace from file..." And select the newly created file "nbs.code-workspace" in the root of the repository.
+
+Or execute
+```
+code nbs.code-workspace
+```
+
+### Code competition
+
+Install all recommended by workspace plugins.
+The most important one is https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd used for code competition and formatting.
+
+### Formatting
+
+Enable feature "Trim trailing whitespace" for user or workspace.
+Enable feature "Trim final newlines" for user or workspace.
+Enable feature "Insert final newline" for user or workspace.

cloud/blockstore/libs/.gitignore

@@ -1,18 +1,19 @@
 client/bench/blockstore-client-bench
-client/ut/cloud-blockstore-libs-client-ut
 client/ut_throttling/cloud-blockstore-libs-client-ut_throttling
+client/ut/cloud-blockstore-libs-client-ut
 common/ut/cloud-blockstore-libs-common-ut
 daemon/ydb/ut/cloud-blockstore-libs-daemon-ydb-ut
 diagnostics/ut/cloud-blockstore-libs-diagnostics-ut
 discovery/ut/cloud-blockstore-libs-discovery-ut
 disk_agent/ut/cloud-blockstore-libs-disk_agent-ut
-encryption/ut/cloud-blockstore-libs-encryption-ut
 encryption/ut_keyring/bin/cloud-blockstore-libs-encryption-ut_keyring-bin
 encryption/ut_keyring/cloud-blockstore-libs-encryption-ut_keyring
+encryption/ut/cloud-blockstore-libs-encryption-ut
 endpoints_grpc/ut/cloud-blockstore-libs-endpoints_grpc-ut
-endpoints/ut/cloud-blockstore-libs-endpoints-ut
 endpoints_vhost/ut/cloud-blockstore-libs-endpoints_vhost-ut
+endpoints/ut/cloud-blockstore-libs-endpoints-ut
 kms/iface/ut/cloud-blockstore-libs-kms-iface-ut
+kms/impl/example/kms-example
 logbroker/iface/ut/cloud-blockstore-libs-logbroker-iface-ut
 logbroker/topic_api_impl/ut/cloud-blockstore-libs-logbroker-topic_api_impl-ut
 nbd/bench/blockstore-nbd-bench
@@ -22,26 +23,25 @@ rdma/iface/ut/cloud-blockstore-libs-rdma-iface-ut
 rdma/impl/ut/cloud-blockstore-libs-rdma-impl-ut
 server/ut/cloud-blockstore-libs-server-ut
 service_kikimr/ut/cloud-blockstore-libs-service_kikimr-ut
-service_local/ut/cloud-blockstore-libs-service_local-ut
 service_local/ut_large/cloud-blockstore-libs-service_local-ut_large
-service_throttling/ut/cloud-blockstore-libs-service_throttling-ut
+service_local/ut/cloud-blockstore-libs-service_local-ut
 service_throttling/ut_logger/blockstore-libs-service_throttling-ut_logger
 service_throttling/ut_metrics/blockstore-libs-service_throttling-ut_metrics
 service_throttling/ut_policy/blockstore-libs-service_throttling-ut_policy
+service_throttling/ut/cloud-blockstore-libs-service_throttling-ut
 service/ut/cloud-blockstore-libs-service-ut
 storage/bootstrapper/ut/cloud-blockstore-libs-storage-bootstrapper-ut
 storage/core/ut/cloud-blockstore-libs-storage-core-ut
 storage/disk_agent/benchmark/benchmark
 storage/disk_agent/model/ut/cloud-blockstore-libs-storage-disk_agent-model-ut
 storage/disk_agent/ut_actor/cloud-blockstore-libs-storage-disk_agent-ut_actor
-storage/disk_agent/ut/cloud-blockstore-libs-storage-disk_agent-ut
 storage/disk_agent/ut_large/cloud-blockstore-libs-storage-disk_agent-ut_large
+storage/disk_agent/ut/cloud-blockstore-libs-storage-disk_agent-ut
+storage/disk_registry_proxy/ut/blockstore-libs-storage-disk_registry_proxy-ut
 storage/disk_registry/actors/ut/libs-storage-disk_registry-actors-ut
 storage/disk_registry/model/ut/blockstore-libs-storage-disk_registry-model-ut
-storage/disk_registry_proxy/ut/blockstore-libs-storage-disk_registry_proxy-ut
 storage/disk_registry/ut_allocation/libs-storage-disk_registry-ut_allocation
 storage/disk_registry/ut_checkpoint/libs-storage-disk_registry-ut_checkpoint
-storage/disk_registry/ut/cloud-blockstore-libs-storage-disk_registry-ut
 storage/disk_registry/ut_cms/blockstore-libs-storage-disk_registry-ut_cms
 storage/disk_registry/ut_config/libs-storage-disk_registry-ut_config
 storage/disk_registry/ut_create/libs-storage-disk_registry-ut_create
@@ -54,27 +54,28 @@ storage/disk_registry/ut_restore/libs-storage-disk_registry-ut_restore
 storage/disk_registry/ut_session/libs-storage-disk_registry-ut_session
 storage/disk_registry/ut_suspend/libs-storage-disk_registry-ut_suspend
 storage/disk_registry/ut_wait_device/storage-disk_registry-ut_wait_device
+storage/disk_registry/ut/cloud-blockstore-libs-storage-disk_registry-ut
 storage/model/ut/cloud-blockstore-libs-storage-model-ut
-storage/partition2/model/ut/cloud-blockstore-libs-storage-partition2-model-ut
-storage/partition2/ut/cloud-blockstore-libs-storage-partition2-ut
 storage/partition_common/ut/cloud-blockstore-libs-storage-partition_common-ut
-storage/partition/model/ut/cloud-blockstore-libs-storage-partition-model-ut
 storage/partition_nonrepl/model/ut/libs-storage-partition_nonrepl-model-ut
 storage/partition_nonrepl/ut/blockstore-libs-storage-partition_nonrepl-ut
+storage/partition/model/ut/cloud-blockstore-libs-storage-partition-model-ut
 storage/partition/ut/cloud-blockstore-libs-storage-partition-ut
+storage/partition2/model/ut/cloud-blockstore-libs-storage-partition2-model-ut
+storage/partition2/ut/cloud-blockstore-libs-storage-partition2-ut
 storage/perf/cloud-blockstore-libs-storage-perf
 storage/service/model/ut/cloud-blockstore-libs-storage-service-model-ut
 storage/service/ut/cloud-blockstore-libs-storage-service-ut
 storage/ss_proxy/ut/cloud-blockstore-libs-storage-ss_proxy-ut
 storage/stats_service/ut/cloud-blockstore-libs-storage-stats_service-ut
 storage/undelivered/ut/cloud-blockstore-libs-storage-undelivered-ut
-storage/volume/actors/ut/cloud-blockstore-libs-storage-volume-actors-ut
 storage/volume_balancer/ut/cloud-blockstore-libs-storage-volume_balancer-ut
-storage/volume/model/ut/cloud-blockstore-libs-storage-volume-model-ut
 storage/volume_proxy/ut/cloud-blockstore-libs-storage-volume_proxy-ut
+storage/volume/actors/ut/cloud-blockstore-libs-storage-volume-actors-ut
+storage/volume/model/ut/cloud-blockstore-libs-storage-volume-model-ut
 storage/volume/ut/cloud-blockstore-libs-storage-volume-ut
 throttling/ut/cloud-blockstore-libs-throttling-ut
 validation/ut/cloud-blockstore-libs-validation-ut
-vhost/ut/cloud-blockstore-libs-vhost-ut
 vhost/ut_stress/cloud-blockstore-libs-vhost-ut_stress
+vhost/ut/cloud-blockstore-libs-vhost-ut
 ydbstats/ut/cloud-blockstore-libs-ydbstats-ut