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.

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

YQ WM fixed build errors #7127

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0fcca60
Only members of ReleaseApprovers team can approve changes in this bra…
maximyurchuk Jul 5, 2024
44a1cd0
Initial commit for stable-24-3 (#6321)
maximyurchuk Jul 5, 2024
c288738
fix query errors processing (#6441) (#6451)
adameat Jul 9, 2024
6353290
Merge #6398 #6405 from main into stable-24-3 (#6448)
alexvru Jul 9, 2024
41ce5c8
Fix test_db_counters test (#6436)
jepett0 Jul 9, 2024
f95e231
24-3 Fix tests with EnableLocalDBBtreeIndex = false (#6391)
kunga Jul 9, 2024
56b5d9a
24-3 Iterative B-Tree histograms builder (#6392)
kunga Jul 9, 2024
64fa639
24-3 Obtain UsedTableMemory from private cache stats, include histori…
kunga Jul 9, 2024
d0cc485
revert 19bed6c19f373cc26a3b8d1d4e4d1ff1126a56ce (#6469)
iddqdex Jul 9, 2024
7c2c3cd
24-3: Fix bugs in coordinator state migration (#6460)
snaury Jul 10, 2024
0711d51
Merge some fixes (#6490)
gridnevvvit Jul 10, 2024
0e4b669
set predicate-extract config default (#6456)
ssmike Jul 10, 2024
35253da
24-3: Fix bugs in: change exchange split, removing schema snapshots &…
CyberROFL Jul 14, 2024
09c3cad
24.3: Fix null dereference in node broker (KIKIMR-21693) (#6516) (#6623)
pixcc Jul 15, 2024
14c79b8
Use the whole TTableDescription to describe an indexImplTable in TInd…
jepett0 Jul 16, 2024
dec025f
Changed memory calculation for TEvFreeItems (merge from main #6625) (…
alexvru Jul 16, 2024
749bd51
fix drain compatability (#6613) (#6716)
vporyadke Jul 17, 2024
3aec0fb
fix neighbours count (#6409) (#6718)
vporyadke Jul 17, 2024
df15684
fix TabletsTotal counter (#6492) (#6717)
vporyadke Jul 17, 2024
56c68e1
do not trigger emergency balancer when all nodes have high usage (#65…
vporyadke Jul 19, 2024
7792457
24-3: schemeshard: preserialize Table.SplitBoundary for describe resu…
ijon Jul 22, 2024
4515805
24-3: schemeshard: reject operations with too big local tx commit (#6…
ijon Jul 22, 2024
b87fc88
24-3: Fix read requirements on init (#6948)
Enjection Jul 22, 2024
6dbec9f
build: refresh Embedded UI (v6.11.0) (#6968)
alexv-smirnov Jul 23, 2024
bf5f3d7
Extend DisabledOnSchemeShard FF for column tables on dedicated bases …
zverevgeny Jul 23, 2024
66d836f
Merge Fix LWTrace leaking HTTP request string to HTML page (#7011) (#…
the-ancient-1 Jul 24, 2024
4ba1b11
deprioritise system tablets in balancer (#6840) (#7047)
vporyadke Jul 25, 2024
2e59d50
use potential max thread count in local (#7050)
vporyadke Jul 25, 2024
7bc362e
merge memory limitations features and staff to stable-24-3 (#6803)
gridnevvvit Jul 25, 2024
8c26a9c
Fix scope id handling (#7093)
Enjection Jul 25, 2024
90805a4
YQ-3345 support load cpu threshold (#6790)
GrigoriyPA Jul 25, 2024
d868fd4
Fixed build errors
GrigoriyPA Jul 26, 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
26 changes: 1 addition & 25 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,25 +1 @@
/*.md @ydb-platform/docs

/ydb/core/fq/ @ydb-platform/fq
/ydb/core/public_http/ @ydb-platform/fq

/ydb/docs/ @ydb-platform/docs

/ydb/library/yql/ @ydb-platform/yql
/ydb/library/yql/dq @ydb-platform/yql @ydb-platform/qp
/ydb/library/yql/providers/generic @ydb-platform/fq
/ydb/library/yql/providers/pq @ydb-platform/fq
/ydb/library/yql/providers/s3 @ydb-platform/fq
/ydb/library/yql/providers/solomon @ydb-platform/fq

/ydb/library/yql/yt @Krock21 @Krisha11 @zlobober @gritukan

/ydb/services/fq/ @ydb-platform/fq

/ydb/core/kafka_proxy @ydb-platform/Topics
/ydb/core/persqueue @ydb-platform/Topics
/ydb/services/datastreams @ydb-platform/Topics
/ydb/services/deprecated/persqueue_v0 @ydb-platform/Topics
/ydb/services/persqueue_v1 @ydb-platform/Topics

/ydb/core/config/ut @ydb-platform/core
* @ydb-platform/ReleaseApprovers
1 change: 1 addition & 0 deletions .github/config/muted_ya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ ydb/tests/fq/yds *
ydb/tests/fq/control_plane_storage *
ydb/tests/functional/audit *
ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication*
ydb/tests/functional/clickbench test.py.test_plans[column]
ydb/tests/functional/kqp/kqp_indexes ConsistentIndexRead.InteractiveTx
ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
ydb/tests/functional/restarts test_restarts.py.*
Expand Down
10 changes: 5 additions & 5 deletions library/cpp/lwtrace/mon/mon_lwtrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ struct TLogQuery {
}
} catch (...) {
ythrow yexception()
<< CurrentExceptionMessage()
<< EncodeHtmlPcdata(CurrentExceptionMessage())
<< " while parsing track log query: "
<< Text;
}
Expand Down Expand Up @@ -1853,7 +1853,7 @@ class TTracesHtmlPrinter {
try {
Os << src->GetStartTime().ToStringUpToSeconds();
} catch (...) {
Os << "error: " << CurrentExceptionMessage();
Os << "error: " << EncodeHtmlPcdata(CurrentExceptionMessage());
}
Os << "</td>"
<< "<td><div class=\"dropdown\">"
Expand Down Expand Up @@ -3821,17 +3821,17 @@ class TLWTraceMonPage : public NMonitoring::IMonPage {
}
} catch (TPageGenBase& gen) {
out.Clear();
out << gen.what();
out << EncodeHtmlPcdata(gen.what());
} catch (...) {
out.Clear();
if (request.GetParams().Get("error") == "text") {
// Text error reply is helpful for ajax requests
out << NMonitoring::HTTPOKTEXT;
out << CurrentExceptionMessage();
out << EncodeHtmlPcdata(CurrentExceptionMessage());
} else {
WWW_HTML(out) {
out << "<h2>Error</h2><pre>"
<< CurrentExceptionMessage()
<< EncodeHtmlPcdata(CurrentExceptionMessage())
<< Endl;
}
}
Expand Down
17 changes: 14 additions & 3 deletions ydb/apps/version/version_definition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,21 @@

NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
// using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
// using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;

return TCurrentConstructor{
.Application = "ydb",
.Version = TVersionConstructor{
.Year = 24,
.Major = 3,
},
.CanConnectTo = {
TCompatibilityRuleConstructor{
.Application = "nbs",
.LowerLimit = TVersionConstructor{ .Year = 23, .Major = 3 },
.UpperLimit = TVersionConstructor{ .Year = 24, .Major = 3 },
}
}
}.ToPB();
}
}
4 changes: 2 additions & 2 deletions ydb/core/base/pool_stats_collector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class TStatsCollectingActor : public NActors::TStatsCollectingActor {
void OnWakeup(const TActorContext &ctx) override {
MiniKQLPoolStats.Update();

TVector<std::tuple<TString, double, ui32>> pools;
TVector<std::tuple<TString, double, ui32, ui32>> pools;
for (const auto& pool : PoolCounters) {
pools.emplace_back(pool.Name, pool.Usage, pool.Threads);
pools.emplace_back(pool.Name, pool.Usage, pool.Threads, pool.LimitThreads);
}

ctx.Send(NNodeWhiteboard::MakeNodeWhiteboardServiceId(ctx.SelfID.NodeId()), new NNodeWhiteboard::TEvWhiteboard::TEvSystemStateUpdate(pools));
Expand Down
22 changes: 22 additions & 0 deletions ydb/core/blobstorage/ut_blobstorage/gc.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include <ydb/core/blobstorage/ut_blobstorage/lib/env.h>

Y_UNIT_TEST_SUITE(GarbageCollection) {
Y_UNIT_TEST(EmptyGcCmd) {
TEnvironmentSetup env({
.Erasure = TBlobStorageGroupType::Erasure4Plus2Block,
});
auto& runtime = env.Runtime;

env.CreateBoxAndPool(1, 1);
auto info = env.GetGroupInfo(env.GetGroups().front());

auto ev = std::make_unique<TEvBlobStorage::TEvCollectGarbage>(1u, 1u, 1u, 0u, false, 0u, 0u, nullptr, nullptr,
TInstant::Max(), true);
const TActorId edge = runtime->AllocateEdgeActor(1, __FILE__, __LINE__);
runtime->WrapInActorContext(edge, [&] {
SendToBSProxy(edge, info->GroupID, ev.release());
});
auto res = env.WaitForEdgeActorEvent<TEvBlobStorage::TEvCollectGarbageResult>(edge);
UNIT_ASSERT_VALUES_EQUAL(res->Get()->Status, NKikimrProto::ERROR);
}
}
1 change: 1 addition & 0 deletions ydb/core/blobstorage/ut_blobstorage/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ SRCS(
ds_proxy_lwtrace.cpp
encryption.cpp
extra_block_checks.cpp
gc.cpp
gc_quorum_3dc.cpp
get.cpp
group_reconfiguration.cpp
Expand Down
7 changes: 7 additions & 0 deletions ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,13 @@ namespace NKikimr {
if (!CheckGC(ctx, record))
return {NKikimrProto::ERROR, 0, false}; // record has duplicates

if (!collect && !record.KeepSize() && !record.DoNotKeepSize()) {
LOG_ERROR_S(ctx, NKikimrServices::BS_HULLRECS, HullDs->HullCtx->VCtx->VDiskLogPrefix
<< "Db# Barriers ValidateGCCmd: empty garbage collection command"
<< " TabletId# " << tabletID);
return {NKikimrProto::ERROR, "empty garbage collection command"};
}

auto blockStatus = THullDbRecovery::IsBlocked(record);
switch (blockStatus.Status) {
case TBlocksCache::EStatus::OK:
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/blobstorage/vdisk/repl/blobstorage_repl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ namespace NKikimr {
// no more blobs to replicate; replication will not resume
State = Finished;
ReplCtx->MonGroup.ReplUnreplicatedVDisks() = 0;
ReplCtx->MonGroup.ReplUnreplicatedPhantoms() = 1;
ReplCtx->MonGroup.ReplUnreplicatedNonPhantoms() = 1;
ReplCtx->MonGroup.ReplUnreplicatedPhantoms() = 0;
ReplCtx->MonGroup.ReplUnreplicatedNonPhantoms() = 0;
ReplCtx->MonGroup.ReplWorkUnitsRemaining() = 0;
ReplCtx->MonGroup.ReplWorkUnitsDone() = 0;
ReplCtx->MonGroup.ReplItemsRemaining() = 0;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/change_exchange/change_sender_common_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ class TBaseChangeSender {
Y_ABORT_UNLESS(it != Broadcasting.end());

auto& broadcast = it->second;
if (broadcast.Partitions.contains(partitionId)) {
if (broadcast.CompletedPartitions.contains(partitionId)) {
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/config/init/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class TDefaultProtoConfigFileProvider
static bool IsFileReadable(const fs::path& p) {
std::error_code ec; // For noexcept overload usage.
auto perms = fs::status(p, ec).permissions();
if ((perms & fs::perms::owner_read) != fs::perms::none &&
(perms & fs::perms::group_read) != fs::perms::none &&
if ((perms & fs::perms::owner_read) != fs::perms::none ||
(perms & fs::perms::group_read) != fs::perms::none ||
(perms & fs::perms::others_read) != fs::perms::none )
{
return true;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/config/init/init_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ class TInitialConfiguratorImpl
}

void FillData(const NConfig::TCommonAppOptions& cf) {
if (cf.TenantName && ScopeId.IsEmpty()) {
if (!cf.TenantName && ScopeId.IsEmpty()) {
const TString myDomain = DeduceNodeDomain(cf, AppConfig);
for (const auto& domain : AppConfig.GetDomainsConfig().GetDomain()) {
if (domain.GetName() == myDomain) {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/run/kikimr_services_initializers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,7 @@ void TKqpServiceInitializer::InitializeServices(NActors::TActorSystemSetup* setu

// Create resource manager
auto rm = NKqp::CreateKqpResourceManagerActor(Config.GetTableServiceConfig().GetResourceManager(), nullptr,
{}, kqpProxySharedResources);
{}, kqpProxySharedResources, NodeId);
setup->LocalServices.push_back(std::make_pair(
NKqp::MakeKqpRmServiceID(NodeId),
TActorSetupCmd(rm, TMailboxType::HTSwap, appData->UserPoolId)));
Expand Down
8 changes: 5 additions & 3 deletions ydb/core/driver_lib/version/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ TCompatibilityInfo::TCompatibilityInfo() {

auto current = MakeCurrent();

// bool success = CompleteFromTag(current);
bool success = CompleteFromTag(current);
Y_UNUSED(success);
// Y_ABORT_UNLESS(success);

CurrentCompatibilityInfo.CopyFrom(current);
Expand Down Expand Up @@ -72,12 +73,13 @@ const TStored* TCompatibilityInfo::GetDefault(TComponentId componentId) const {
// obsolete version control
TMaybe<NActors::TInterconnectProxyCommon::TVersionInfo> VERSION = NActors::TInterconnectProxyCommon::TVersionInfo{
// version of this binary
"trunk",
"stable-24-3",

// compatible versions; must include all compatible old ones, including this one; version verification occurs on both
// peers and connection is accepted if at least one of peers accepts the version of the other peer
{
"trunk"
"stable-24-2",
"stable-24-3"
}
};

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/formats/arrow/ssa_runtime_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace NKikimr::NSsa {

// Bump this version every time incompatible runtime functions are introduced.
#ifndef SSA_RUNTIME_VERSION
#define SSA_RUNTIME_VERSION 5U
#define SSA_RUNTIME_VERSION 4U
#endif

// History:
Expand Down
Loading
Loading