grpc client retry policy enable

Signed-off-by: Mikhail Boldyrev <[email protected]>
hyperledger-iroha · Jul 24, 2019 · 1657d3a · 1657d3a
1 parent 848c29c
commit 1657d3a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 18 deletions.
diff --git a/irohad/multi_sig_transactions/transport/impl/mst_transport_grpc.cpp b/irohad/multi_sig_transactions/transport/impl/mst_transport_grpc.cpp
@@ -14,6 +14,7 @@
 #include "interfaces/iroha_internal/transaction_batch.hpp"
 #include "interfaces/transaction.hpp"
 #include "logger/logger.hpp"
+#include "network/impl/grpc_channel_builder.hpp"
 #include "validators/field_validator.hpp"
 
 using namespace iroha;
@@ -22,8 +23,7 @@ using namespace iroha::network;
 using iroha::ConstRefState;
 namespace {
   auto default_sender_factory = [](const shared_model::interface::Peer &to) {
-    return transport::MstTransportGrpc::NewStub(
-        grpc::CreateChannel(to.address(), grpc::InsecureChannelCredentials()));
+    return createClient<transport::MstTransportGrpc>(to.address());
   };
 }
 void sendStateAsyncImpl(

diff --git a/irohad/network/impl/block_loader_impl.cpp b/irohad/network/impl/block_loader_impl.cpp
@@ -130,7 +130,7 @@ BlockLoaderImpl::findPeer(const shared_model::crypto::PublicKey &pubkey) {
   return *it;
 }
 
-proto::Loader::Stub &BlockLoaderImpl::getPeerStub(
+proto::Loader::StubInterface &BlockLoaderImpl::getPeerStub(
     const shared_model::interface::Peer &peer) {
   auto it = peer_connections_.find(peer.address());
   if (it == peer_connections_.end()) {

diff --git a/irohad/network/impl/block_loader_impl.hpp b/irohad/network/impl/block_loader_impl.hpp
@@ -49,11 +49,11 @@ namespace iroha {
        * @param peer for connecting
        * @return RPC stub
        */
-      proto::Loader::Stub &getPeerStub(
+      proto::Loader::StubInterface &getPeerStub(
           const shared_model::interface::Peer &peer);
 
       std::unordered_map<shared_model::interface::types::AddressType,
-                         std::unique_ptr<proto::Loader::Stub>>
+                         std::unique_ptr<proto::Loader::StubInterface>>
           peer_connections_;
       std::shared_ptr<ametsuchi::PeerQueryFactory> peer_query_factory_;
       shared_model::proto::ProtoBlockFactory block_factory_;

diff --git a/irohad/network/impl/grpc_channel_builder.hpp b/irohad/network/impl/grpc_channel_builder.hpp
@@ -6,27 +6,67 @@
 #ifndef IROHA_GRPC_CHANNEL_BUILDER_HPP
 #define IROHA_GRPC_CHANNEL_BUILDER_HPP
 
+#include <limits>
+#include <memory>
+
 #include <grpc++/grpc++.h>
+#include <boost/format.hpp>
 
 namespace iroha {
   namespace network {
+    namespace details {
+      constexpr unsigned int kMaxRequestMessageBytes =
+          std::numeric_limits<int>::max();
+      constexpr unsigned int kMaxResponseMessageBytes =
+          std::numeric_limits<int>::max();
+
+      template <typename T>
+      grpc::ChannelArguments getChannelArguments() {
+        grpc::ChannelArguments args;
+        args.SetServiceConfigJSON((boost::format(R"(
+            {
+              "methodConfig": [ {
+                "name": [
+                  { "service": "%1%" }
+                ],
+                "retryPolicy": {
+                  "maxAttempts": 5,
+                  "initialBackoff": "5s",
+                  "maxBackoff": "120s",
+                  "backoffMultiplier": 1.6,
+                  "retryableStatusCodes": [
+                    "UNKNOWN",
+                    "DEADLINE_EXCEEDED",
+                    "ABORTED",
+                    "INTERNAL"
+                  ]
+                },
+                "maxRequestMessageBytes": %2%,
+                "maxResponseMessageBytes": %3%
+              } ]
+            })") % T::service_full_name()
+                                   % kMaxRequestMessageBytes
+                                   % kMaxResponseMessageBytes)
+                                      .str());
+        return args;
+      }
+    }  // namespace details
 
     /**
      * Creates client which is capable of sending and receiving
-     * messages of INT_MAX bytes size
+     * messages of INT_MAX bytes size with retry policy (see
+     * details::getChannelArguments()).
      * @tparam T type for gRPC stub, e.g. proto::Yac
      * @param address ip address for connection, ipv4:port
      * @return gRPC stub of parametrized type
      */
     template <typename T>
-    auto createClient(const grpc::string &address) {
-      // in order to bypass built-in limitation of gRPC message size
-      grpc::ChannelArguments args;
-      args.SetMaxSendMessageSize(INT_MAX);
-      args.SetMaxReceiveMessageSize(INT_MAX);
-
-      return T::NewStub(grpc::CreateCustomChannel(
-          address, grpc::InsecureChannelCredentials(), args));
+    std::unique_ptr<typename T::StubInterface> createClient(
+        const grpc::string &address) {
+      return T::NewStub(
+          grpc::CreateCustomChannel(address,
+                                    grpc::InsecureChannelCredentials(),
+                                    details::getChannelArguments<T>()));
     }
   }  // namespace network
 }  // namespace iroha

diff --git a/irohad/torii/impl/query_client.cpp b/irohad/torii/impl/query_client.cpp
@@ -5,6 +5,8 @@
 
 #include "torii/query_client.hpp"
 
+#include <grpc++/channel.h>
+#include <grpc++/grpc++.h>
 #include "network/impl/grpc_channel_builder.hpp"
 
 namespace torii_utils {

diff --git a/irohad/torii/query_client.hpp b/irohad/torii/query_client.hpp
@@ -8,8 +8,6 @@
 
 #include <endpoint.grpc.pb.h>
 #include <endpoint.pb.h>
-#include <grpc++/channel.h>
-#include <grpc++/grpc++.h>
 #include <memory>
 #include <thread>
 
@@ -45,12 +43,13 @@ namespace torii_utils {
 
     std::string ip_;
     size_t port_;
-    std::unique_ptr<iroha::protocol::QueryService_v1::Stub> stub_;
+    std::unique_ptr<iroha::protocol::QueryService_v1::StubInterface> stub_;
   };
+
   /**
    * QueryAsyncClient
 
-  // Impelent here if we need this.
+  // Implement here if we need this.
 
   class QueryAsyncClient {
   };