Skip to content

Commit ab486ea

Browse files
authored
Merge pull request ceph#60923 from mkogan1/wip-rgs-rr
rgw: respect rgw_graceful_stop on realm reload Reviewed-by: Casey Bodley <[email protected]>
2 parents 88f3811 + 7ee9ad0 commit ab486ea

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/rgw/rgw_asio_frontend.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,8 +1194,11 @@ void AsioFrontend::pause()
11941194
l.signal.emit(boost::asio::cancellation_type::terminal);
11951195
}
11961196

1197-
// close all connections so outstanding requests fail quickly
1198-
connections.close(ec);
1197+
const bool graceful_stop{ g_ceph_context->_conf->rgw_graceful_stop };
1198+
if (!graceful_stop) {
1199+
// close all connections so outstanding requests fail quickly
1200+
connections.close(ec);
1201+
}
11991202

12001203
// pause and wait until outstanding requests complete
12011204
pause_mutex.lock(ec);

0 commit comments

Comments
 (0)