aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexnick <alexnick@yandex-team.ru>2022-02-22 13:03:42 +0300
committeralexnick <alexnick@yandex-team.ru>2022-02-22 13:03:42 +0300
commit373ccab9dcf81e8b7739c3e57bca4fbaf0faf343 (patch)
treecbae5e0aaa788685be4c26256343b0d5dc33afd2
parent86a73ce9bff1b39bff03db19405ddc1c93701df7 (diff)
downloadydb-373ccab9dcf81e8b7739c3e57bca4fbaf0faf343.tar.gz
fix for test KIKIMR-14230
ref:02f9e7dbc94b83f2f5e6e9e9fd29f79004cbfe33
-rw-r--r--build/mapping.conf.json6
-rwxr-xr-xya4
-rw-r--r--ydb/services/persqueue_v1/persqueue_ut.cpp7
3 files changed, 11 insertions, 6 deletions
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 8b878a3744..8ddaa5d9a1 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -2940,6 +2940,12 @@
"2807634670": "https://storage.mds.yandex.net/get-devtools-opensource/471749/2807634670",
"2807634842": "https://storage.mds.yandex.net/get-devtools-opensource/250854/2807634842",
"2807635068": "https://storage.mds.yandex.net/get-devtools-opensource/479623/2807635068",
+ "2812429184": "https://storage.mds.yandex.net/get-devtools-opensource/233854/2812429184",
+ "2812430072": "https://storage.mds.yandex.net/get-devtools-opensource/233854/2812430072",
+ "2812430500": "https://storage.mds.yandex.net/get-devtools-opensource/479623/2812430500",
+ "2812465732": "https://storage.mds.yandex.net/get-devtools-opensource/471749/2812465732",
+ "2812467322": "https://storage.mds.yandex.net/get-devtools-opensource/233854/2812467322",
+ "2812467790": "https://storage.mds.yandex.net/get-devtools-opensource/471749/2812467790",
"309054781": "https://storage.mds.yandex.net/get-devtools-opensource/250854/309054781",
"360916612": "https://storage.mds.yandex.net/get-devtools-opensource/233854/360916612",
"412716868": "https://storage.mds.yandex.net/get-devtools-opensource/233854/412716868",
diff --git a/ya b/ya
index 62676d9d61..402c4455f0 100755
--- a/ya
+++ b/ya
@@ -4,8 +4,8 @@ import sys
import platform
import json
-URLS = ["https://storage.mds.yandex.net/get-devtools-opensource/250854/f72b5038f470b6778aba44e5becd908b"]
-MD5 = "f72b5038f470b6778aba44e5becd908b"
+URLS = ["https://storage.mds.yandex.net/get-devtools-opensource/233854/7389b72dfa2a5e402ccfcc2b6dcdbd5b"]
+MD5 = "7389b72dfa2a5e402ccfcc2b6dcdbd5b"
RETRIES = 5
HASH_PREFIX = 10
diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp
index 84ad280f7e..0f5310c2a8 100644
--- a/ydb/services/persqueue_v1/persqueue_ut.cpp
+++ b/ydb/services/persqueue_v1/persqueue_ut.cpp
@@ -2269,7 +2269,7 @@ namespace {
auto log = setup.GetLog();
setup.GetPQConfig().SetClustersUpdateTimeoutSec(0);
setup.GetPQConfig().SetRemoteClusterEnabledDelaySec(0);
- setup.GetPQConfig().SetCloseClientSessionWithEnabledRemotePreferredClusterDelaySec(0);
+ setup.GetPQConfig().SetCloseClientSessionWithEnabledRemotePreferredClusterDelaySec(3);
const auto edgeActorID = setup.GetServer().GetRuntime()->AllocateEdgeActor();
@@ -2277,12 +2277,11 @@ namespace {
log << TLOG_INFO << "Wait for cluster tracker event";
auto clustersUpdate = setup.GetServer().GetRuntime()->GrabEdgeEvent<NPQ::NClusterTracker::TEvClusterTracker::TEvClustersUpdate>();
-
+ TInstant now = TInstant::Now();
auto session = setup.InitWriteSession(GenerateSessionSetupWithPreferredCluster(setup.GetRemoteCluster()));
- AssertStreamingSessionAlive(session.first);
-
AssertStreamingSessionDead(session.first, Ydb::StatusIds::ABORTED, Ydb::PersQueue::ErrorCode::PREFERRED_CLUSTER_MISMATCHED);
+ UNIT_ASSERT(TInstant::Now() - now > TDuration::Seconds(3));
}
Y_UNIT_TEST(PreferredCluster_NonExistentPreferredCluster_SessionDiesOnlyAfterDelay) {