YDB Import 480

ydb-platform · Dec 6, 2023 · e3cbe12 · e3cbe12
1 parent 21eeaa5
commit e3cbe12
Show file tree

Hide file tree

Showing 151 changed files with 3,579 additions and 3,719 deletions.
diff --git a/.mapping.json b/.mapping.json
@@ -6001,6 +6001,11 @@
   "contrib/ydb/library/yql/utils/log/proto/CMakeLists.linux-x86_64.txt":"",
   "contrib/ydb/library/yql/utils/log/proto/CMakeLists.txt":"",
   "contrib/ydb/library/yql/utils/log/proto/CMakeLists.windows-x86_64.txt":"",
+  "contrib/ydb/library/yql/utils/plan/CMakeLists.darwin-x86_64.txt":"",
+  "contrib/ydb/library/yql/utils/plan/CMakeLists.linux-aarch64.txt":"",
+  "contrib/ydb/library/yql/utils/plan/CMakeLists.linux-x86_64.txt":"",
+  "contrib/ydb/library/yql/utils/plan/CMakeLists.txt":"",
+  "contrib/ydb/library/yql/utils/plan/CMakeLists.windows-x86_64.txt":"",
   "contrib/ydb/library/yql/utils/threading/CMakeLists.darwin-x86_64.txt":"",
   "contrib/ydb/library/yql/utils/threading/CMakeLists.linux-aarch64.txt":"",
   "contrib/ydb/library/yql/utils/threading/CMakeLists.linux-x86_64.txt":"",

diff --git a/contrib/ydb/core/base/appdata.cpp b/contrib/ydb/core/base/appdata.cpp
@@ -74,6 +74,7 @@ TAppData::TAppData(
     , DomainsConfigPtr(new NKikimrConfig::TDomainsConfig())
     , BootstrapConfigPtr(new NKikimrConfig::TBootstrap())
     , AwsCompatibilityConfigPtr(new NKikimrConfig::TAwsCompatibilityConfig())
+    , S3ProxyResolverConfigPtr(new NKikimrConfig::TS3ProxyResolverConfig())
     , StreamingConfig(*StreamingConfigPtr.get())
     , PQConfig(*PQConfigPtr.get())
     , PQClusterDiscoveryConfig(*PQClusterDiscoveryConfigPtr.get())
@@ -94,6 +95,7 @@ TAppData::TAppData(
     , DomainsConfig(*DomainsConfigPtr.get())
     , BootstrapConfig(*BootstrapConfigPtr.get())
     , AwsCompatibilityConfig(*AwsCompatibilityConfigPtr.get())
+    , S3ProxyResolverConfig(*S3ProxyResolverConfigPtr.get())
     , KikimrShouldContinue(kikimrShouldContinue)
 
 {}

diff --git a/contrib/ydb/core/base/appdata_fwd.h b/contrib/ydb/core/base/appdata_fwd.h
@@ -59,6 +59,7 @@ namespace NKikimrConfig {
     class TDomainsConfig;
     class TBootstrap;
     class TAwsCompatibilityConfig;
+    class TS3ProxyResolverConfig;
 }
 
 namespace NKikimrNetClassifier {
@@ -201,6 +202,7 @@ struct TAppData {
     std::unique_ptr<NKikimrConfig::TDomainsConfig> DomainsConfigPtr;
     std::unique_ptr<NKikimrConfig::TBootstrap> BootstrapConfigPtr;
     std::unique_ptr<NKikimrConfig::TAwsCompatibilityConfig> AwsCompatibilityConfigPtr;
+    std::unique_ptr<NKikimrConfig::TS3ProxyResolverConfig> S3ProxyResolverConfigPtr;
     std::unique_ptr<NKikimrSharedCache::TSharedCacheConfig> SharedCacheConfigPtr;
 
     NKikimrStream::TStreamingConfig& StreamingConfig;
@@ -223,6 +225,7 @@ struct TAppData {
     NKikimrConfig::TDomainsConfig& DomainsConfig;
     NKikimrConfig::TBootstrap& BootstrapConfig;
     NKikimrConfig::TAwsCompatibilityConfig& AwsCompatibilityConfig;
+    NKikimrConfig::TS3ProxyResolverConfig& S3ProxyResolverConfig;
     bool EnforceUserTokenRequirement = false;
     bool AllowHugeKeyValueDeletes = true; // delete when all clients limit deletes per request
     bool EnableKqpSpilling = false;

diff --git a/contrib/ydb/core/cms/cluster_info.cpp b/contrib/ydb/core/cms/cluster_info.cpp
@@ -795,6 +795,18 @@ ui64 TClusterInfo::AddExternalLocks(const TNotificationInfo &notification, const
     return locks;
 }
 
+void TClusterInfo::SetHostMarkers(const TString &hostName, const THashSet<NKikimrCms::EMarker> &markers) {
+    for (auto node : NodePtrs(hostName)) {
+        node->Markers.insert(markers.begin(), markers.end());
+    }
+}
+
+void TClusterInfo::ResetHostMarkers(const TString &hostName) {
+    for (auto node : NodePtrs(hostName)) {
+        node->Markers.clear();
+    }
+}
+
 void TClusterInfo::ApplyDowntimes(const TDowntimes &downtimes)
 {
     for (auto &pr : downtimes.NodeDowntimes) {

diff --git a/contrib/ydb/core/cms/cluster_info.h b/contrib/ydb/core/cms/cluster_info.h
@@ -297,6 +297,7 @@ class TLockableItem : public TThrRefBase {
     std::list<TScheduledLock> ScheduledLocks;
     TVector<TTemporaryLock> TempLocks;
     ui64 DeactivatedLocksOrder = Max<ui64>();
+    THashSet<NKikimrCms::EMarker> Markers;
 };
 
 using TLockableItemPtr = TIntrusivePtr<TLockableItem>;
@@ -902,6 +903,9 @@ class TClusterInfo : public TThrRefBase {
 
     ui64 AddExternalLocks(const TNotificationInfo &notification, const TActorContext *ctx);
 
+    void SetHostMarkers(const TString &hostName, const THashSet<NKikimrCms::EMarker> &markers);
+    void ResetHostMarkers(const TString &hostName);
+
     void ApplyDowntimes(const TDowntimes &downtimes);
     void UpdateDowntimes(TDowntimes &downtimes, const TActorContext &ctx);