diff options
author | Alexander Smirnov <[email protected]> | 2025-01-27 05:03:15 +0000 |
---|---|---|
committer | Alexander Smirnov <[email protected]> | 2025-01-27 05:03:15 +0000 |
commit | f657b938eac33abf4a9a5f3edd399bfd3c282e80 (patch) | |
tree | 976603bee93aecd56aa0346ac4a59c9dd74fbb4a | |
parent | 13139655023430dbd1825ba33a219a5a0152a882 (diff) | |
parent | b0e27a16f1e5c7401a45d435fdd10041792d57d3 (diff) |
Merge pull request #13847 from ydb-platform/merge-libs-250127-0020
-rw-r--r-- | build/conf/java.conf | 2 | ||||
-rw-r--r-- | build/conf/linkers/ld.conf | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/builtins/ya.make | 4 | ||||
-rw-r--r-- | ydb/ci/rightlib.txt | 2 | ||||
-rw-r--r-- | yt/yt/client/api/queue_transaction.h | 4 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/transaction_impl.cpp | 1 | ||||
-rw-r--r-- | yt/yt/client/driver/queue_commands.cpp | 7 | ||||
-rw-r--r-- | yt/yt/library/program/helpers.cpp | 7 | ||||
-rw-r--r-- | yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto | 2 |
10 files changed, 19 insertions, 14 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 9426ecd9180..6403346a1c4 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -849,13 +849,13 @@ PACK_JAR=$_PACK_JAR_HELPER($TARGET) LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:2"} \ && $PREPARE_JAR_BUILD \ && $JAR_GEN_SRCS \ + && $_PREPARE_SRC_JAR \ && $ALL_KT_COMMANDS \ && $COLLECT_CLASSPATH \ && $LINK_CLASSPATH \ && $COMPILE_JAVA_SRCLIST \ && $LINK_JAR_RESOURCES \ && ${cwd;suf=/cls:BINDIR} $GENERATE_VCS_JAVA_INFO_NODEP . \ - && $_PREPARE_SRC_JAR \ && $_PACK_SRC_JAR \ && $_PACK_JNI \ && $PACK_JAR \ diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 54cd9b6239f..e5f3d11d033 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -105,7 +105,7 @@ when ($OS_LINUX == "yes" && $MUSL != "yes") { # glibc merged pthread into libc.so as of 2.34 / Ubuntu 22.04, see # https://developers.redhat.com/articles/2021/12/17/why-glibc-234-removed-libpthread # - # In macOS and iOS libpthread points to libSystem alread (just as libc.tbd does): + # In macOS and iOS libpthread points to libSystem already (just as libc.tbd does): # $ file libpthread.tbd # libpthread.tbd: symbolic link to libSystem.tbd # diff --git a/contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym b/contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym index ff0d9d04010..ac76bc2e97b 100644 --- a/contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym +++ b/contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym @@ -1,6 +1,6 @@ {% extends '//builtin/bag.ym' %} -{% block current_version %}19.1.6{% endblock %} +{% block current_version %}19.1.7{% endblock %} {% block current_url %} https://github.com/llvm/llvm-project/releases/download/llvmorg-{{self.version().strip()}}/compiler-rt-{{self.version().strip()}}.src.tar.xz diff --git a/contrib/libs/cxxsupp/builtins/ya.make b/contrib/libs/cxxsupp/builtins/ya.make index fd0988489da..b6d7a872abd 100644 --- a/contrib/libs/cxxsupp/builtins/ya.make +++ b/contrib/libs/cxxsupp/builtins/ya.make @@ -12,9 +12,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(19.1.6) +VERSION(19.1.7) -ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.6/compiler-rt-19.1.6.src.tar.xz) +ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.7/compiler-rt-19.1.7.src.tar.xz) NO_COMPILER_WARNINGS() diff --git a/ydb/ci/rightlib.txt b/ydb/ci/rightlib.txt index 0a85c910058..a28c2bd3a37 100644 --- a/ydb/ci/rightlib.txt +++ b/ydb/ci/rightlib.txt @@ -1 +1 @@ -c2d97d01a33ba140ab946abd09fa1e5a3eafec4a +cff9a3f8b35e0e274fe0603b17e60d4a82d35311 diff --git a/yt/yt/client/api/queue_transaction.h b/yt/yt/client/api/queue_transaction.h index 4644fcc8e17..1487cb0ca30 100644 --- a/yt/yt/client/api/queue_transaction.h +++ b/yt/yt/client/api/queue_transaction.h @@ -30,6 +30,10 @@ struct TPushQueueProducerOptions * what data should be written after fail of the user process. */ NYTree::INodePtr UserMeta; + + //! If this happens to be a push into a replicated table queue, + //! controls if at least one sync replica is required. + bool RequireSyncReplica = true; }; struct TPushQueueProducerResult diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp index b3cff92078c..9cc13718fab 100644 --- a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp +++ b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp @@ -552,6 +552,7 @@ TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer( if (options.SequenceNumber) { req->set_sequence_number(options.SequenceNumber->Underlying()); } + req->set_require_sync_replica(options.RequireSyncReplica); if (NTracing::IsCurrentTraceContextRecorded()) { req->TracingTags().emplace_back("yt.producer_path", ToString(producerPath)); diff --git a/yt/yt/client/driver/queue_commands.cpp b/yt/yt/client/driver/queue_commands.cpp index 8f8040b1932..fea2f15d9e9 100644 --- a/yt/yt/client/driver/queue_commands.cpp +++ b/yt/yt/client/driver/queue_commands.cpp @@ -389,7 +389,12 @@ void TPushQueueProducerCommand::Register(TRegistrar registrar) registrar.Parameter("queue_path", &TThis::QueuePath); registrar.Parameter("session_id", &TThis::SessionId); registrar.Parameter("epoch", &TThis::Epoch); - + registrar.ParameterWithUniversalAccessor<bool>( + "require_sync_replica", + [] (TThis* command) -> auto& { + return command->Options.RequireSyncReplica; + }) + .Optional(/*init*/ false); } void TPushQueueProducerCommand::DoExecute(ICommandContextPtr context) diff --git a/yt/yt/library/program/helpers.cpp b/yt/yt/library/program/helpers.cpp index d53aa477d0d..af2f2de4e65 100644 --- a/yt/yt/library/program/helpers.cpp +++ b/yt/yt/library/program/helpers.cpp @@ -5,8 +5,6 @@ #include <yt/yt/core/logging/log_manager.h> -#include <yt/yt/core/net/address.h> - namespace NYT { //////////////////////////////////////////////////////////////////////////////// @@ -17,11 +15,6 @@ void ConfigureSingletons(const TSingletonsConfigPtr& config) // TODO(babenko): move to server program base NLogging::TLogManager::Get()->EnableReopenOnSighup(); - - // By default, server components must have a reasonable FQDN. - // Failure to do so may result in issues like YT-4561. - // TODO(babenko): move to server program base - NNet::TAddressResolver::Get()->EnsureLocalHostName(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto index 7cfd7994d0f..bfdd234fb23 100644 --- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto +++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto @@ -685,6 +685,8 @@ message TReqPushQueueProducer optional bytes user_meta = 6; // YSON optional int64 sequence_number = 7; + optional bool require_sync_replica = 8; + required TRowsetDescriptor rowset_descriptor = 200; } |