aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov <ivanmorozov@yandex-team.com>2023-04-17 18:32:20 +0300
committerivanmorozov <ivanmorozov@yandex-team.com>2023-04-17 18:32:20 +0300
commit01b4e6cd2305374e1316a0bcac01b3119abeeb78 (patch)
tree32a32e65eef3e2a62a38dda976fab5bb74cd9ece
parentd1b1f02e4911fe1c3adfaa6b3b29e165c0c50085 (diff)
downloadydb-01b4e6cd2305374e1316a0bcac01b3119abeeb78.tar.gz
correct message on scheme cache not started yet
-rw-r--r--ydb/services/metadata/ds_table/accessor_snapshot_base.cpp2
-rw-r--r--ydb/services/metadata/ds_table/table_exists.cpp15
-rw-r--r--ydb/services/metadata/ds_table/table_exists.h4
3 files changed, 12 insertions, 9 deletions
diff --git a/ydb/services/metadata/ds_table/accessor_snapshot_base.cpp b/ydb/services/metadata/ds_table/accessor_snapshot_base.cpp
index c58cf5362a..b43c854c50 100644
--- a/ydb/services/metadata/ds_table/accessor_snapshot_base.cpp
+++ b/ydb/services/metadata/ds_table/accessor_snapshot_base.cpp
@@ -65,7 +65,7 @@ void TDSAccessorBase::Handle(TEvRecheckExistence::TPtr& ev) {
}
void TDSAccessorBase::Handle(TTableExistsActor::TEvController::TEvError::TPtr& ev) {
- ALS_ERROR(NKikimrServices::METADATA_PROVIDER) << "cannot detect path existence: " << ev->Get()->GetPath() << "/" << ev->Get()->GetErrorMessage();
+ AFL_ERROR(NKikimrServices::METADATA_PROVIDER)("action", "cannot detect path existence")("path", ev->Get()->GetPath())("error", ev->Get()->GetErrorMessage());
Schedule(TDuration::Seconds(1), new TEvRecheckExistence(ev->Get()->GetPath()));
}
diff --git a/ydb/services/metadata/ds_table/table_exists.cpp b/ydb/services/metadata/ds_table/table_exists.cpp
index 330dd722b1..760c5f02e5 100644
--- a/ydb/services/metadata/ds_table/table_exists.cpp
+++ b/ydb/services/metadata/ds_table/table_exists.cpp
@@ -38,22 +38,25 @@ void TTableExistsActor::Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::T
}
}
-NKikimrServices::TActivity::EType TTableExistsActor::ActorActivityType() {
- return NKikimrServices::TActivity::METADATA_SCHEME_DESCRIPTION_ACTOR;
-}
-
void TTableExistsActor::OnBootstrap() {
Become(&TTableExistsActor::StateMain);
auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
request->DatabaseName = NKikimr::CanonizePath(AppData()->TenantName);
auto& entry = request->ResultSet.emplace_back();
- entry.Operation = NSchemeCache::TSchemeCacheNavigate::OpTable;
+ entry.Operation = NSchemeCache::TSchemeCacheNavigate::OpPath;
entry.Path = NKikimr::SplitPath(Path);
- Send(MakeSchemeCacheID(), new TEvTxProxySchemeCache::TEvNavigateKeySet(request.Release()));
+ AFL_DEBUG(NKikimrServices::METADATA_PROVIDER)("self_id", SelfId())("send_to", MakeSchemeCacheID());
+ Send(MakeSchemeCacheID(), new TEvTxProxySchemeCache::TEvNavigateKeySet(request.Release()), IEventHandle::FlagTrackDelivery);
+}
+
+void TTableExistsActor::Handle(NActors::TEvents::TEvUndelivered::TPtr& /*ev*/) {
+ AFL_WARN(NKikimrServices::METADATA_PROVIDER)("actor", "TTableExistsActor")("event", "undelivered")("self_id", SelfId())("send_to", MakeSchemeCacheID());
+ OutputController->OnPathExistsCheckFailed("scheme_cache_undelivered_message", Path);
}
void TTableExistsActor::OnTimeout() {
+ AFL_ERROR(NKikimrServices::METADATA_PROVIDER)("actor", "TTableExistsActor")("event", "timeout")("self_id", SelfId())("send_to", MakeSchemeCacheID());
OutputController->OnPathExistsCheckFailed("timeout", Path);
}
diff --git a/ydb/services/metadata/ds_table/table_exists.h b/ydb/services/metadata/ds_table/table_exists.h
index 7f0635fc71..bbf0667460 100644
--- a/ydb/services/metadata/ds_table/table_exists.h
+++ b/ydb/services/metadata/ds_table/table_exists.h
@@ -19,6 +19,7 @@ private:
ITableExistsController::TPtr OutputController;
const TString Path;
void Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev);
+ void Handle(NActors::TEvents::TEvUndelivered::TPtr& ev);
virtual void OnBootstrap() override;
virtual void OnTimeout() override;
public:
@@ -65,11 +66,10 @@ public:
}
};
- static NKikimrServices::TActivity::EType ActorActivityType();
-
STFUNC(StateMain) {
switch (ev->GetTypeRewrite()) {
hFunc(TEvTxProxySchemeCache::TEvNavigateKeySetResult, Handle);
+ hFunc(NActors::TEvents::TEvUndelivered, Handle);
default:
TBase::StateMain(ev);
}