rgw/sfs: Use sqlite3_status() in make_sqlite3_status_fn()

The current implementation calls sqlite3_db_status(), which is incorrect, given we're using it for SQLITE_STATUS_MEMORY_USED, SQLITE_STATUS_MALLOC_SIZE, and SQLITE_STATUS_MALLOC_COUNT. These codes are for use with sqlite3_status(). Signed-off-by: Tim Serong <[email protected]> (cherry picked from commit ee79aba)
tserong · Oct 18, 2023 · b6406bc · b6406bc
1 parent 39134ba
commit b6406bc
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/rgw/rgw_sal_sfs.cc b/src/rgw/rgw_sal_sfs.cc
@@ -512,16 +512,12 @@ void SFStore::filesystem_stats_updater_main(
 
 std::vector<std::function<MetricsStatusPage::ScalarMetricFunction>>
 SFStore::custom_metric_fns() {
-  sqlite3* sqlite_db = db_conn->first_sqlite_conn;
   auto make_sqlite3_status_fn = [&](const std::string& name, int op,
                                     bool use_highwater = false) {
-    return [sqlite_db, op, use_highwater, name]() {
+    return [op, use_highwater, name]() {
       int current;
       int highwater;
-      int ret = SQLITE_ERROR;
-      if (sqlite_db) {
-        ret = sqlite3_db_status(sqlite_db, op, &current, &highwater, false);
-      }
+      int ret = sqlite3_status(op, &current, &highwater, false);
       if (ret != SQLITE_OK) {
         return std::make_tuple(
             perfcounter_type_d::PERFCOUNTER_U64, name, std::nan("error")