Pass max_ignored_errors/fallback_to_stale_replicas to PoolWithFailoverBase::get() too

azat · azat · commit b8ee2ea7d9e4 · 2020-06-20T11:46:13.000+03:00
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
@@ -84,7 +84,10 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
         break;
     }
 
-    return Base::get(try_get_entry, get_priority);
+    UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;
+    bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;
+
+    return Base::get(max_ignored_errors, fallback_to_stale_replicas, try_get_entry, get_priority);
 }
 
 ConnectionPoolWithFailover::Status ConnectionPoolWithFailover::getStatus() const
@@ -206,8 +209,8 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
         break;
     }
 
-    bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;
     UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;
+    bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;
 
     return Base::getMany(min_entries, max_entries, max_tries,
         max_ignored_errors, fallback_to_stale_replicas,
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
@@ -117,7 +117,8 @@ class PoolWithFailoverBase : private boost::noncopyable
     using PoolStates = std::vector<PoolState>;
 
     /// Returns a single connection.
-    Entry get(const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority = GetPriorityFunc());
+    Entry get(size_t max_ignored_errors, bool fallback_to_stale_replicas,
+        const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority = GetPriorityFunc());
 
     /// This function returns a copy of pool states to avoid race conditions when modifying shared pool states.
     PoolStates updatePoolStates(size_t max_ignored_errors);
@@ -138,9 +139,13 @@ class PoolWithFailoverBase : private boost::noncopyable
 
 template <typename TNestedPool>
 typename TNestedPool::Entry
-PoolWithFailoverBase<TNestedPool>::get(const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority)
+PoolWithFailoverBase<TNestedPool>::get(size_t max_ignored_errors, bool fallback_to_stale_replicas,
+    const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority)
 {
-    std::vector<TryResult> results = getMany(1, 1, 1, 0, true, try_get_entry, get_priority);
+    std::vector<TryResult> results = getMany(
+        1 /* min entries */, 1 /* max entries */, 1 /* max tries */,
+        max_ignored_errors, fallback_to_stale_replicas,
+        try_get_entry, get_priority);
     if (results.empty() || results[0].entry.isNull())
         throw DB::Exception(
                 "PoolWithFailoverBase::getMany() returned less than min_entries entries.",

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,10 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts`
`84`	`84`	`break;`
`85`	`85`	`}`
`86`	`86`
`87`		`- return Base::get(try_get_entry, get_priority);`
	`87`	`+ UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;`
	`88`	`+ bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;`
	`89`	`+`
	`90`	`+ return Base::get(max_ignored_errors, fallback_to_stale_replicas, try_get_entry, get_priority);`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`ConnectionPoolWithFailover::Status ConnectionPoolWithFailover::getStatus() const`
`@@ -206,8 +209,8 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g`
`206`	`209`	`break;`
`207`	`210`	`}`
`208`	`211`
`209`		`- bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;`
`210`	`212`	`UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;`
	`213`	`+ bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;`
`211`	`214`
`212`	`215`	`return Base::getMany(min_entries, max_entries, max_tries,`
`213`	`216`	`max_ignored_errors, fallback_to_stale_replicas,`