error message into conveyor task

3 files changed, 40 insertions, 3 deletions

diff --git a/ydb/core/tx/conveyor/service/worker.cpp b/ydb/core/tx/conveyor/service/worker.cpp
index caba610a3a..466be3d047 100644
--- a/ydb/core/tx/conveyor/service/worker.cpp
+++ b/ydb/core/tx/conveyor/service/worker.cpp
@@ -7,7 +7,7 @@ void TWorker::HandleMain(TEvInternal::TEvNewTask::TPtr& ev) {
     if (workerTask.GetTask()->Execute()) {
         TBase::Sender<TEvInternal::TEvTaskProcessedResult>(workerTask.GetOwnerId(), workerTask.GetTask()).SendTo(ev->Sender);
     } else {
-        TBase::Sender<TEvInternal::TEvTaskProcessedResult>(workerTask.GetOwnerId(), "cannot execute task").SendTo(ev->Sender);
+        TBase::Sender<TEvInternal::TEvTaskProcessedResult>(workerTask.GetOwnerId(), workerTask.GetTask()->GetErrorMessage()).SendTo(ev->Sender);
     }
 }
 
diff --git a/ydb/core/tx/conveyor/usage/abstract.cpp b/ydb/core/tx/conveyor/usage/abstract.cpp
index 42737a8e14..1d2eaeffcd 100644
--- a/ydb/core/tx/conveyor/usage/abstract.cpp
+++ b/ydb/core/tx/conveyor/usage/abstract.cpp
@@ -1,5 +1,27 @@
 #include "abstract.h"
+#include <util/generic/yexception.h>
+#include <util/string/builder.h>
 
 namespace NKikimr::NConveyor {
+bool ITask::Execute() {
+    bool result = false;
+    try {
+        result = DoExecute();
+        if (!result) {
+            if (!ErrorMessage) {
+                ErrorMessage = "cannot execute task (not specified error message)";
+            }
+        }
+    } catch (...) {
+        TStringBuilder sbLocalMessage;
+        sbLocalMessage << "exception: " << CurrentExceptionMessage();
+        if (!ErrorMessage) {
+            ErrorMessage = sbLocalMessage;
+        } else {
+            ErrorMessage += sbLocalMessage;
+        }
+    }
+    return result;
+}
 
 }
diff --git a/ydb/core/tx/conveyor/usage/abstract.h b/ydb/core/tx/conveyor/usage/abstract.h
index 5901809330..fa60859083 100644
--- a/ydb/core/tx/conveyor/usage/abstract.h
+++ b/ydb/core/tx/conveyor/usage/abstract.h
@@ -1,17 +1,32 @@
 #pragma once
 #include <memory>
+#include <ydb/library/accessor/accessor.h>
+#include <util/generic/string.h>
 
 namespace NKikimr::NConveyor {
 
 class ITask {
+private:
+    TString ErrorMessage;
 protected:
+    ITask& SetErrorMessage(const TString& message) {
+        ErrorMessage = message;
+        return *this;
+    }
     virtual bool DoExecute() = 0;
 public:
     using TPtr = std::shared_ptr<ITask>;
     virtual ~ITask() = default;
-    bool Execute() {
-        return DoExecute();
+
+    bool HasError() const {
+        return !!ErrorMessage;
     }
+
+    const TString& GetErrorMessage() const {
+        return ErrorMessage;
+    }
+
+    bool Execute();
 };
 
 }