not asserting on wrong condition on rate-limiting

Author: fcostaoliveira

memtier_benchmark.cpp

@@ -1568,8 +1568,8 @@ run_stats run_benchmark(int run_id, benchmark_config* cfg, object_generator* obj
         unsigned long int total_connection_errors = 0;
 
         for (std::vector<cg_thread*>::iterator i = threads.begin(); i != threads.end(); i++) {
-            // Check if thread needs restart
-            if ((*i)->m_finished && (*i)->m_restart_requested && (*i)->m_restart_count < 5) {
+            // Check if thread needs restart (but only if shutdown is not requested)
+            if (!g_shutdown_requested && (*i)->m_finished && (*i)->m_restart_requested && (*i)->m_restart_count < 5) {
                 benchmark_error_log("Restarting thread %u (restart #%u)...\n",
                                   (*i)->m_thread_id, (*i)->m_restart_count + 1);
 

shard_connection.cpp

@@ -367,6 +367,9 @@ void shard_connection::disconnect() {
 
     m_connection_state = conn_disconnected;
 
+    // Reset rate limiting state during disconnection
+    m_request_per_cur_interval = 0;
+
     // by default no need to send any setup request
     m_authentication = setup_done;
     m_db_selection = setup_done;
@@ -421,8 +424,13 @@ void shard_connection::push_req(request* req) {
     m_pipeline->push(req);
     m_pending_resp++;
     if (m_config->request_rate) {
-        assert(m_request_per_cur_interval > 0);
-        m_request_per_cur_interval--;
+        // Handle race condition during reconnection - don't assert if interval is 0
+        if (m_request_per_cur_interval > 0) {
+            m_request_per_cur_interval--;
+        } else {
+            // Rate limit exceeded, but don't crash - just log debug info
+            benchmark_debug_log("Rate limit interval exhausted during request push (connection %u)\n", m_id);
+        }
     }
 }