aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov <ivanmorozov@yandex-team.com>2023-07-03 12:26:26 +0300
committerivanmorozov <ivanmorozov@yandex-team.com>2023-07-03 12:26:26 +0300
commitf12bd19e8cddac19aed1767a20500459bdd2feb5 (patch)
tree759822edc7fd14fc8ae42a47378c4f6c12e47835
parent8ae2ffcd1c9ddbd2fbe5576dcb88185e92ce08f5 (diff)
downloadydb-f12bd19e8cddac19aed1767a20500459bdd2feb5.tar.gz
additional logging and mkdir command
-rw-r--r--ydb/services/metadata/request/common.h17
-rw-r--r--ydb/services/metadata/request/request_actor.h2
-rw-r--r--ydb/services/metadata/request/request_actor_cb.h2
3 files changed, 19 insertions, 2 deletions
diff --git a/ydb/services/metadata/request/common.h b/ydb/services/metadata/request/common.h
index 47d65dd34f..6bcff29790 100644
--- a/ydb/services/metadata/request/common.h
+++ b/ydb/services/metadata/request/common.h
@@ -7,6 +7,7 @@
#include <library/cpp/actors/core/actor_bootstrapped.h>
#include <ydb/library/accessor/accessor.h>
#include <ydb/public/api/protos/ydb_table.pb.h>
+#include <ydb/public/api/protos/ydb_scheme.pb.h>
#include <ydb/core/base/events.h>
namespace NKikimr::NMetadata::NRequest {
@@ -39,6 +40,11 @@ enum EEvents {
EvRequestFinished,
EvRequestFailed,
EvRequestStart,
+
+ EvCreatePathRequest,
+ EvCreatePathInternalResponse,
+ EvCreatePathResponse,
+
EvEnd
};
@@ -65,6 +71,8 @@ public:
virtual void OnRequestFailed(const TString& errorMessage) = 0;
};
+using TDialogCreatePath = TDialogPolicyImpl<Ydb::Scheme::MakeDirectoryRequest, Ydb::Scheme::MakeDirectoryResponse,
+ EEvents::EvCreatePathRequest, EEvents::EvCreatePathInternalResponse, EEvents::EvCreatePathResponse>;
using TDialogCreateTable = TDialogPolicyImpl<Ydb::Table::CreateTableRequest, Ydb::Table::CreateTableResponse,
EEvents::EvCreateTableRequest, EEvents::EvCreateTableInternalResponse, EEvents::EvCreateTableResponse>;
using TDialogDropTable = TDialogPolicyImpl<Ydb::Table::DropTableRequest, Ydb::Table::DropTableResponse,
@@ -95,6 +103,15 @@ public:
};
template <>
+class TOperatorChecker<Ydb::Scheme::MakeDirectoryResponse> {
+public:
+ static bool IsSuccess(const Ydb::Scheme::MakeDirectoryResponse& r) {
+ return r.operation().status() == Ydb::StatusIds::SUCCESS ||
+ r.operation().status() == Ydb::StatusIds::ALREADY_EXISTS;
+ }
+};
+
+template <>
class TOperatorChecker<Ydb::Table::CreateTableResponse> {
public:
static bool IsSuccess(const Ydb::Table::CreateTableResponse& r) {
diff --git a/ydb/services/metadata/request/request_actor.h b/ydb/services/metadata/request/request_actor.h
index 7352f59c85..988fcd11df 100644
--- a/ydb/services/metadata/request/request_actor.h
+++ b/ydb/services/metadata/request/request_actor.h
@@ -61,7 +61,7 @@ public:
auto f = ev->Get()->GetFuture();
TResponse response = f.ExtractValue();
if (!TOperatorChecker<TResponse>::IsSuccess(response)) {
- ALS_ERROR(NKikimrServices::METADATA_PROVIDER) << "incorrect reply: " << response.DebugString();
+ AFL_ERROR(NKikimrServices::METADATA_PROVIDER)("event", "unexpected reply")("error_message", response.DebugString())("request", ProtoRequest.DebugString());
NYql::TIssues issue;
NYql::IssuesFromMessage(response.operation().issues(), issue);
OnInternalResultError(issue.ToString());
diff --git a/ydb/services/metadata/request/request_actor_cb.h b/ydb/services/metadata/request/request_actor_cb.h
index f13b71d7fb..181a937798 100644
--- a/ydb/services/metadata/request/request_actor_cb.h
+++ b/ydb/services/metadata/request/request_actor_cb.h
@@ -31,7 +31,7 @@ private:
}
TResponse response = f.GetValue();
if (!TOperatorChecker<TResponse>::IsSuccess(response)) {
- ALS_ERROR(NKikimrServices::METADATA_PROVIDER) << "incorrect reply: " << response.DebugString();
+ AFL_ERROR(NKikimrServices::METADATA_PROVIDER)("event", "unexpected reply")("response", response.DebugString());
NYql::TIssues issue;
NYql::IssuesFromMessage(response.operation().issues(), issue);
externalController->OnRequestFailed(issue.ToString());