removing shutdown v1

Signed-off-by: dorjesinpo <[email protected]>

Author: dorjesinpo

src/groups/mqb/mqba/mqba_adminsession.cpp

@@ -414,13 +414,9 @@ void AdminSession::tearDown(const bsl::shared_ptr<void>& session,
     // 'session' go out of scope.
 }
 
-void AdminSession::initiateShutdown(const ShutdownCb&         callback,
-                                    const bsls::TimeInterval& timeout,
-                                    bool supportShutdownV2)
+void AdminSession::initiateShutdown(const ShutdownCb& callback)
 {
     // executed by the *ANY* thread
-    (void)timeout;
-    (void)supportShutdownV2;
 
     dispatcher()->execute(
         bdlf::BindUtil::bind(&AdminSession::initiateShutdownDispatched,

src/groups/mqb/mqba/mqba_adminsession.h

@@ -241,15 +241,8 @@ class AdminSession : public mqbnet::Session, public mqbi::DispatcherClient {
     void flush() BSLS_KEYWORD_OVERRIDE;
 
     /// Initiate the shutdown of the session and invoke the specified
-    /// `callback` upon completion of (asynchronous) shutdown sequence or
-    /// if the specified `timeout` is expired.
-    /// The optional (temporary) specified 'supportShutdownV2' indicates
-    /// shutdown V2 logic which is not applicable to `AdminSession`
-    /// implementation.
-    void
-    initiateShutdown(const ShutdownCb&         callback,
-                     const bsls::TimeInterval& timeout,
-                     bool supportShutdownV2 = false) BSLS_KEYWORD_OVERRIDE;
+    /// `callback` upon completion of (asynchronous) shutdown sequence.
+    void initiateShutdown(const ShutdownCb& callback) BSLS_KEYWORD_OVERRIDE;
 
     /// Make the session abandon any work it has.
     void invalidate() BSLS_KEYWORD_OVERRIDE;

src/groups/mqb/mqba/mqba_application.cpp

@@ -476,13 +476,9 @@ void Application::stop()
 
     bool supportShutdownV2 = initiateShutdown();
 
-    if (supportShutdownV2) {
-        BALL_LOG_INFO << ": Executing GRACEFUL_SHUTDOWN_V2";
-    }
-    else {
-        BALL_LOG_INFO << ": Peers do not support "
-                      << "GRACEFUL_SHUTDOWN_V2. Retreat to V1";
-    }
+    BSLS_ASSERT_SAFE(supportShutdownV2);
+
+    BALL_LOG_INFO << ": Executing GRACEFUL_SHUTDOWN_V2";
 
     // For each cluster in cluster catalog, inform peers about this shutdown.
     int          count = d_clusterCatalog_mp->count();
@@ -494,8 +490,7 @@ void Application::stop()
          count > 0;
          ++clusterIt, --count) {
         clusterIt.cluster()->initiateShutdown(
-            bdlf::BindUtil::bind(&bslmt::Latch::arrive, &latch),
-            supportShutdownV2);
+            bdlf::BindUtil::bind(&bslmt::Latch::arrive, &latch));
     }
     latch.wait();
 
@@ -625,10 +620,8 @@ bool Application::initiateShutdown()
 
     for (Sessions::const_iterator cit = clients.begin(); cit != clients.end();
          ++cit) {
-        (*cit)->initiateShutdown(bdlf::BindUtil::bind(&bslmt::Latch::arrive,
-                                                      &latchDownstreams),
-                                 shutdownTimeout,
-                                 true);
+        (*cit)->initiateShutdown(
+            bdlf::BindUtil::bind(&bslmt::Latch::arrive, &latchDownstreams));
     }
 
     // Need to wait for peers to update this node status to guarantee no new