- Added wait-until parameter for begin_nbo_phase_two().

- Retry enter_toi() in poll_enter_toi() also for error_connection_failed
  which means that the connectivity to the cluster has been lost,
  a.k.a non-prim.

include/wsrep/client_state.hpp

@@ -790,8 +790,13 @@ namespace wsrep
          * passed to begin_nbo_phase_one().
          *
          * @param keys Key array.
+         * @param wait_until Time point to wait until for entering TOI for
+         *                   phase two.
          */
-        int begin_nbo_phase_two(const wsrep::key_array& keys);
+        int begin_nbo_phase_two(const wsrep::key_array& keys,
+                                std::chrono::time_point<wsrep::clock>
+                                wait_until =
+                                std::chrono::time_point<wsrep::clock>());
 
         /**
          * End non-blocking operation phase two. This call will
@@ -1018,6 +1023,7 @@ namespace wsrep
         poll_enter_toi(wsrep::unique_lock<wsrep::mutex>& lock,
                        const wsrep::key_array& keys,
                        const wsrep::const_buffer& buffer,
+                       wsrep::ws_meta& meta,
                        int flags,
                        std::chrono::time_point<wsrep::clock> wait_until);
         void enter_toi_common(wsrep::unique_lock<wsrep::mutex>&);

include/wsrep/provider.hpp

@@ -237,7 +237,8 @@ namespace wsrep
             error_size_exceeded,
             /** Connectivity to cluster lost */
             error_connection_failed,
-            /** Internal provider failure, provider must be reinitialized */
+            /** Internal provider failure or provider was closed,
+                provider must be reinitialized */
             error_provider_failed,
             /** Fatal error, server must abort */
             error_fatal,