Intermediate changes

5 files changed, 11 insertions, 2 deletions

diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index a90d3245107..3fa9ca23207 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -699,7 +699,7 @@ ITransactionPtr TClient::AttachTransaction(
 
 void TClient::HandleError(const TErrorOr<void>& error, int clientIndex)
 {
-    if (!NRpc::IsChannelFailureError(error)) {
+    if (!NRpc::IsChannelFailureError(error) && !Config_->RetryAnyError) {
         return;
     }
 
diff --git a/yt/yt/client/federated/config.cpp b/yt/yt/client/federated/config.cpp
index d16649672ce..edba2d190ed 100644
--- a/yt/yt/client/federated/config.cpp
+++ b/yt/yt/client/federated/config.cpp
@@ -18,6 +18,9 @@ void TFederationConfig::Register(TRegistrar registrar)
     registrar.Parameter("cluster_retry_attempts", &TThis::ClusterRetryAttempts)
         .GreaterThanOrEqual(0)
         .Default(3);
+
+    registrar.Parameter("retry_any_error", &TThis::RetryAnyError)
+        .Default(false);
 }
 
 void TConnectionConfig::Register(TRegistrar registrar)
diff --git a/yt/yt/client/federated/config.h b/yt/yt/client/federated/config.h
index c3a67aef585..115d0450dcb 100644
--- a/yt/yt/client/federated/config.h
+++ b/yt/yt/client/federated/config.h
@@ -25,6 +25,9 @@ public:
     //! Maximum number of retry attempts to make.
     int ClusterRetryAttempts;
 
+    //! For testing purposes only. Retry any error through a different cluster.
+    bool RetryAnyError;
+
     REGISTER_YSON_STRUCT(TFederationConfig);
 
     static void Register(TRegistrar registrar);
diff --git a/yt/yt/client/object_client/public.h b/yt/yt/client/object_client/public.h
index b8a8d1ae7b9..0d774fcc806 100644
--- a/yt/yt/client/object_client/public.h
+++ b/yt/yt/client/object_client/public.h
@@ -331,6 +331,9 @@ DEFINE_ENUM(EObjectType,
     // Zookeeper stuff
     ((ZookeeperShard)                              (1400))
     ((ZookeeperShardMap)                           (1401))
+
+    // Flow stuff
+    ((Pipeline)                                    (1600))
 );
 
 //! A bit mask marking schema types.
diff --git a/yt/yt/flow/lib/client/public.h b/yt/yt/flow/lib/client/public.h
index e1812eaa08a..b194200cda4 100644
--- a/yt/yt/flow/lib/client/public.h
+++ b/yt/yt/flow/lib/client/public.h
@@ -35,7 +35,7 @@ YT_DEFINE_STRONG_TYPEDEF(TVersion, i64);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-inline const TString PipelineFormatVersionAttribute("flow_pipeline_format_version");
+inline const TString PipelineFormatVersionAttribute("pipeline_format_version");
 inline const TString LeaderControllerAddressAttribute("leader_controller_address");
 
 constexpr int CurrentPipelineFormatVersion = 1;