]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #56158 from yuvalif/wip-64885-reef
authorYuri Weinstein <yweinste@redhat.com>
Wed, 29 Jan 2025 23:23:20 +0000 (15:23 -0800)
committerGitHub <noreply@github.com>
Wed, 29 Jan 2025 23:23:20 +0000 (15:23 -0800)
reef: rgw/kafka: set message timeout to 5 seconds

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
1  2 
src/common/options/rgw.yaml.in
src/rgw/rgw_kafka.cc

Simple merge
index b85b8344efd0c605a52284ecc4c0c37578e6557b,03b11980ae7c24c51172a8ea2b7ea884a2ff7624..290fde360ff0d37e1d3434fe593dbbf1b115d978
@@@ -458,10 -465,10 +464,10 @@@ private
          auto& conn = conn_it->second;
  
          // Checking the connection idlesness
-         if(conn->timestamp.sec() + max_idle_time < ceph_clock_now()) {
+         if(conn->timestamp.sec() + conn->cct->_conf->rgw_kafka_connection_idle < ceph_clock_now()) {
            ldout(conn->cct, 20) << "kafka run: deleting a connection due to idle behaviour: " << ceph_clock_now() << dendl;
            std::lock_guard lock(connections_lock);
 -          conn->destroy(STATUS_CONNECTION_IDLE);
 +          conn->status = STATUS_CONNECTION_IDLE;
            conn_it = connections.erase(conn_it);
            --connection_count; \
            continue;