Fixes in Rados profiling.

ecmwf · Jun 28, 2024 · 8e1457a · 8e1457a
1 parent ef1c8d4
commit 8e1457a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/src/eckit/io/rados/RadosCluster.cc b/src/eckit/io/rados/RadosCluster.cc
@@ -165,7 +165,7 @@ RadosIter::~RadosIter() {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-const RadosCluster& RadosCluster::instance() {
+RadosCluster& RadosCluster::instance() {
     static RadosCluster instance_;
     return instance_;
 }

diff --git a/src/eckit/io/rados/RadosCluster.h b/src/eckit/io/rados/RadosCluster.h
@@ -82,7 +82,7 @@ class RadosCluster {
     void removeAll(const RadosObject&) const;
 
 
-    static const RadosCluster& instance();
+    static RadosCluster& instance();
 
     // profiling
     eckit::RadosIOStats& stats() { return stats_; }

diff --git a/src/eckit/io/rados/RadosException.cc b/src/eckit/io/rados/RadosException.cc
@@ -14,11 +14,15 @@ namespace eckit {
 
 //----------------------------------------------------------------------------------------------------------------------
 
+RadosException::RadosException() : Exception() {}
+
 RadosException::RadosException(const std::string& w) : Exception(w) {}
 
 RadosException::RadosException(const std::string& w, const eckit::CodeLocation& l) :
     Exception(w, l) {}
 
+RadosEntityNotFoundException::RadosEntityNotFoundException() : RadosException() {};
+
 RadosEntityNotFoundException::RadosEntityNotFoundException(const std::string& w) : RadosException(w) {}
 
 RadosEntityNotFoundException::RadosEntityNotFoundException(const std::string& w, const eckit::CodeLocation& l) :

diff --git a/src/eckit/io/rados/RadosException.h b/src/eckit/io/rados/RadosException.h
@@ -21,6 +21,7 @@ namespace eckit {
 
 class RadosException : public eckit::Exception {
 public:
+    RadosException();
     RadosException(const std::string&);
     RadosException(const std::string&, const eckit::CodeLocation&);
 };
@@ -29,6 +30,7 @@ class RadosException : public eckit::Exception {
 
 class RadosEntityNotFoundException : public RadosException {
 public:
+    RadosEntityNotFoundException();
     RadosEntityNotFoundException(const std::string&);
     RadosEntityNotFoundException(const std::string&, const eckit::CodeLocation&);
 };

diff --git a/src/eckit/io/rados/RadosKeyValue.cc b/src/eckit/io/rados/RadosKeyValue.cc
@@ -144,7 +144,7 @@ bool RadosKeyValue::has(const std::string& key) const {
             0  /// @note: flags
         )
     );
-    st2.stop(),
+    st2.stop();
 
     eckit::StatsTimer st3{"rados_kv_has_aio_wait_for_complete", timer, std::bind(&eckit::RadosIOStats::logMdOperation, &stats, _1, _2)};
     RADOS_CALL(rados_aio_wait_for_complete(comp.comp_));
@@ -439,7 +439,7 @@ std::vector<std::string> RadosKeyValue::keys(int keysPerQuery) const {
 
             res.push_back(std::string(key, key + key_len));
 
-            st4.start();
+            st4.start("rados_omap_get_next2", std::bind(&eckit::RadosIOStats::logMdOperation, &stats, _1, _2));
         }
         st4.stop();