@@ -475,13 +475,9 @@ void Application::stop()
475475
476476 bool supportShutdownV2 = initiateShutdown ();
477477
478- if (supportShutdownV2) {
479- BALL_LOG_INFO << " : Executing GRACEFUL_SHUTDOWN_V2" ;
480- }
481- else {
482- BALL_LOG_INFO << " : Peers do not support "
483- << " GRACEFUL_SHUTDOWN_V2. Retreat to V1" ;
484- }
478+ BSLS_ASSERT_SAFE (supportShutdownV2);
479+
480+ BALL_LOG_INFO << " : Executing GRACEFUL_SHUTDOWN_V2" ;
485481
486482 // For each cluster in cluster catalog, inform peers about this shutdown.
487483 int count = d_clusterCatalog_mp->count ();
@@ -493,8 +489,7 @@ void Application::stop()
493489 count > 0 ;
494490 ++clusterIt, --count) {
495491 clusterIt.cluster ()->initiateShutdown (
496- bdlf::BindUtil::bind (&bslmt::Latch::arrive, &latch),
497- supportShutdownV2);
492+ bdlf::BindUtil::bind (&bslmt::Latch::arrive, &latch));
498493 }
499494 latch.wait ();
500495
@@ -627,10 +622,8 @@ bool Application::initiateShutdown()
627622
628623 for (Sessions::const_iterator cit = clients.begin (); cit != clients.end ();
629624 ++cit) {
630- (*cit)->initiateShutdown (bdlf::BindUtil::bind (&bslmt::Latch::arrive,
631- &latchDownstreams),
632- shutdownTimeout,
633- true );
625+ (*cit)->initiateShutdown (
626+ bdlf::BindUtil::bind (&bslmt::Latch::arrive, &latchDownstreams));
634627 }
635628
636629 // Need to wait for peers to update this node status to guarantee no new
0 commit comments