Merge pull request ceph#59243 from cbodley/wip-67522

cbodley · web-flow · commit 8ed9518c6013 · 2024-08-26T11:04:38.000-04:00
rgw/http: finish_request() after logging errors

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
@@ -1147,7 +1147,6 @@ void *RGWHTTPManager::reqs_thread_entry()
           http_status = err.http_ret;
         }
         int id = req_data->id;
-	finish_request(req_data, status, http_status);
         switch (result) {
           case CURLE_OK:
             break;
@@ -1160,6 +1159,7 @@ void *RGWHTTPManager::reqs_thread_entry()
             dout(20) << "ERROR: curl error: " << curl_easy_strerror((CURLcode)result) << " req_data->error_buf=" << req_data->error_buf << dendl;
 	    break;
         }
+	finish_request(req_data, status, http_status);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1147,7 +1147,6 @@ void *RGWHTTPManager::reqs_thread_entry()`
`1147`	`1147`	`http_status = err.http_ret;`
`1148`	`1148`	`}`
`1149`	`1149`	`int id = req_data->id;`
`1150`		`- finish_request(req_data, status, http_status);`
`1151`	`1150`	`switch (result) {`
`1152`	`1151`	`case CURLE_OK:`
`1153`	`1152`	`break;`
`@@ -1160,6 +1159,7 @@ void *RGWHTTPManager::reqs_thread_entry()`
`1160`	`1159`	`dout(20) << "ERROR: curl error: " << curl_easy_strerror((CURLcode)result) << " req_data->error_buf=" << req_data->error_buf << dendl;`
`1161`	`1160`	`break;`
`1162`	`1161`	`}`
	`1162`	`+ finish_request(req_data, status, http_status);`
`1163`	`1163`	`}`
`1164`	`1164`	`}`
`1165`	`1165`	`}`