Building NBS/NFS as nbs application

ydb-platform · Mar 18, 2024 · d1ef493 · d1ef493
1 parent ad0d642
commit d1ef493
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 20 deletions.
diff --git a/cloud/blockstore/apps/disk_agent/ya.make b/cloud/blockstore/apps/disk_agent/ya.make
@@ -13,7 +13,6 @@ PEERDIR(
 
     cloud/storage/core/libs/daemon
 
-    contrib/ydb/core/driver_lib/run
     contrib/ydb/core/security
 
     library/cpp/getopt

diff --git a/cloud/blockstore/apps/server/ya.make b/cloud/blockstore/apps/server/ya.make
@@ -18,7 +18,6 @@ PEERDIR(
     cloud/storage/core/libs/daemon
     cloud/storage/core/libs/iam/iface
 
-    contrib/ydb/core/driver_lib/run
     contrib/ydb/core/security
 
     library/cpp/getopt

diff --git a/cloud/blockstore/libs/storage/disk_registry/ya.make b/cloud/blockstore/libs/storage/disk_registry/ya.make
@@ -79,7 +79,6 @@ PEERDIR(
     contrib/ydb/core/scheme
     contrib/ydb/core/tablet
     contrib/ydb/core/tablet_flat
-    contrib/ydb/core/testlib/basics
 )
 
 END()

diff --git a/cloud/blockstore/libs/storage/disk_registry_proxy/ya.make b/cloud/blockstore/libs/storage/disk_registry_proxy/ya.make
@@ -17,8 +17,6 @@ PEERDIR(
     contrib/ydb/core/mon
     contrib/ydb/core/tablet
     contrib/ydb/core/tablet_flat
-    contrib/ydb/core/testlib
-    contrib/ydb/core/testlib/basics
 )
 
 END()

diff --git a/cloud/blockstore/libs/storage/init/common/ya.make b/cloud/blockstore/libs/storage/init/common/ya.make
@@ -9,6 +9,7 @@ PEERDIR(
     cloud/blockstore/libs/storage/api
 
     cloud/storage/core/libs/kikimr
+    cloud/storage/core/libs/version_ydb
 
     contrib/ydb/library/actors/core
     contrib/ydb/library/actors/util

diff --git a/cloud/blockstore/libs/storage/init/server/ya.make b/cloud/blockstore/libs/storage/init/server/ya.make
@@ -39,7 +39,6 @@ PEERDIR(
     contrib/ydb/library/actors/util
 
     contrib/ydb/core/base
-    contrib/ydb/core/driver_lib/run
     contrib/ydb/core/load_test
     contrib/ydb/core/mind
     contrib/ydb/core/mon

diff --git a/cloud/blockstore/libs/storage/partition/ya.make b/cloud/blockstore/libs/storage/partition/ya.make
@@ -77,7 +77,6 @@ PEERDIR(
     contrib/ydb/core/scheme
     contrib/ydb/core/tablet
     contrib/ydb/core/tablet_flat
-    contrib/ydb/core/testlib/basics
     contrib/ydb/library/actors/core
 )
 

diff --git a/cloud/blockstore/libs/storage/partition2/ya.make b/cloud/blockstore/libs/storage/partition2/ya.make
@@ -72,7 +72,6 @@ PEERDIR(
     contrib/ydb/core/scheme
     contrib/ydb/core/tablet
     contrib/ydb/core/tablet_flat
-    contrib/ydb/core/testlib/basics
     contrib/ydb/library/actors/core
 )
 

diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/ya.make b/cloud/blockstore/libs/storage/partition_nonrepl/ya.make
@@ -72,8 +72,6 @@ PEERDIR(
     library/cpp/containers/ring_buffer
 
     contrib/ydb/core/base
-    contrib/ydb/core/testlib
-    contrib/ydb/core/testlib/basics
     contrib/ydb/library/actors/core
 )
 

diff --git a/cloud/blockstore/libs/storage/undelivered/ya.make b/cloud/blockstore/libs/storage/undelivered/ya.make
@@ -8,8 +8,6 @@ PEERDIR(
     cloud/blockstore/libs/kikimr
     cloud/blockstore/libs/storage/api
     contrib/ydb/library/actors/core
-    contrib/ydb/core/testlib
-    contrib/ydb/core/testlib/basics
 )
 
 END()

diff --git a/cloud/blockstore/libs/storage/volume_proxy/ya.make b/cloud/blockstore/libs/storage/volume_proxy/ya.make
@@ -10,7 +10,6 @@ PEERDIR(
     cloud/blockstore/libs/storage/core
     contrib/ydb/library/actors/core
     contrib/ydb/core/tablet
-    contrib/ydb/core/testlib
 )
 
 END()

diff --git a/cloud/filestore/libs/storage/init/ya.make b/cloud/filestore/libs/storage/init/ya.make
@@ -18,6 +18,7 @@ PEERDIR(
     cloud/storage/core/libs/hive_proxy
     cloud/storage/core/libs/kikimr
     cloud/storage/core/libs/user_stats
+    cloud/storage/core/libs/version_ydb
 
     contrib/ydb/library/actors/core
 

diff --git a/cloud/storage/core/libs/cloud/storage/core/libs/version_ydb/ya.make b/cloud/storage/core/libs/cloud/storage/core/libs/version_ydb/ya.make
@@ -0,0 +1,16 @@
+OWNER(g:cloud-nbs)
+
+LIBRARY()
+
+SRCS(
+    version.cpp
+)
+
+PEERDIR(
+    ydb/core/driver_lib/version
+)
+
+END()
+
+RECURSE_FOR_TESTS(ut)
+
diff --git a/cloud/storage/core/libs/hive_proxy/ut/ya.make b/cloud/storage/core/libs/hive_proxy/ut/ya.make
@@ -15,6 +15,7 @@ SRCS(
 )
 
 PEERDIR(
+    contrib/ydb/core/testlib
     contrib/ydb/core/testlib/default
     contrib/ydb/core/testlib/basics
 )

diff --git a/cloud/storage/core/libs/hive_proxy/ya.make b/cloud/storage/core/libs/hive_proxy/ya.make
@@ -24,8 +24,6 @@ PEERDIR(
     contrib/ydb/core/mind
     contrib/ydb/core/tablet
     contrib/ydb/core/tablet_flat
-    contrib/ydb/core/testlib
-    contrib/ydb/core/testlib/basics
 
     contrib/ydb/library/actors/core
 )

diff --git a/cloud/storage/core/libs/version_ydb/version.cpp b/cloud/storage/core/libs/version_ydb/version.cpp
@@ -0,0 +1,14 @@
+#include <ydb/core/driver_lib/version/version.h>
+
+namespace NKikimr::NPDisk {
+extern const ui64 YdbDefaultPDiskSequence = 0;
+}
+
+NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
+    using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
+
+    return TCurrentConstructor{
+        .Application = "nbs",
+    }.ToPB();
+}
+
diff --git a/cloud/storage/core/libs/version_ydb/ya.make b/cloud/storage/core/libs/version_ydb/ya.make
@@ -0,0 +1,16 @@
+OWNER(g:cloud-nbs)
+
+LIBRARY()
+
+SRCS(
+    version.cpp
+)
+
+PEERDIR(
+    contrib/ydb/core/driver_lib/version
+)
+
+END()
+
+RECURSE_FOR_TESTS(ut)
+
diff --git a/contrib/ydb/apps/version/version_definition.cpp b/contrib/ydb/apps/version/version_definition.cpp
@@ -0,0 +1,10 @@
+#include <ydb/core/driver_lib/version/version.h>
+
+NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
+    using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
+
+    return TCurrentConstructor{
+        .Application = "ydb",
+    }.ToPB();
+}
+
diff --git a/contrib/ydb/apps/version/ya.make b/contrib/ydb/apps/version/ya.make
@@ -0,0 +1,12 @@
+LIBRARY(version_definition)
+
+SRCS(
+    version_definition.cpp
+)
+
+PEERDIR(
+    contrib/ydb/core/driver_lib/version
+)
+
+END()
+
diff --git a/contrib/ydb/apps/ydbd/ya.make b/contrib/ydb/apps/ydbd/ya.make
@@ -35,6 +35,7 @@ IF (ARCH_X86_64)
 ENDIF()
 
 PEERDIR(
+    contrib/ydb/apps/version
     contrib/ydb/core/driver_lib/run
     contrib/ydb/core/protos
     contrib/ydb/core/security

diff --git a/contrib/ydb/core/driver_lib/version/ut/ya.make b/contrib/ydb/core/driver_lib/version/ut/ya.make
@@ -6,6 +6,7 @@ TIMEOUT(300)
 SIZE(MEDIUM)
 
 PEERDIR(
+    contrib/ydb/apps/version
     contrib/ydb/core/driver_lib/version
 )
 

diff --git a/contrib/ydb/core/driver_lib/version/version.cpp b/contrib/ydb/core/driver_lib/version/version.cpp
@@ -17,18 +17,14 @@ using EComponentId = NKikimrConfig::TCompatibilityRule;
 using TComponentId = NKikimrConfig::TCompatibilityRule::EComponentId;
 
 TCompatibilityInfo::TCompatibilityInfo() {
-    using TCurrentConstructor = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
     using TStoredConstructor = TCompatibilityInfo::TProtoConstructor::TStoredCompatibilityInfo;
-    // using TCompatibilityRuleConstructor = TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
     using TVersionConstructor = TCompatibilityInfo::TProtoConstructor::TVersion;
 
     /////////////////////////////////////////////////////////
     // Current CompatibilityInfo
     /////////////////////////////////////////////////////////
 
-    auto current = TCurrentConstructor{
-        .Application = "ydb"
-    }.ToPB();
+    auto current = MakeCurrent();
 
     // bool success = CompleteFromTag(current);
     // Y_ABORT_UNLESS(success);

diff --git a/contrib/ydb/core/driver_lib/version/version.h b/contrib/ydb/core/driver_lib/version/version.h
@@ -141,6 +141,8 @@ class TCompatibilityInfo {
 
     bool CompleteFromTag(NKikimrConfig::TCurrentCompatibilityInfo& current);
 
+    static NKikimrConfig::TCurrentCompatibilityInfo MakeCurrent();
+
     NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId) const;
     NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId,
             const NKikimrConfig::TCurrentCompatibilityInfo* current) const;