Develop

.github/workflows/build.yml

@@ -35,5 +35,7 @@ jobs:
       run: ./autogen.sh && ./configure --with-dovecot=/usr/local/lib/dovecot --enable-maintainer-mode --enable-debug --with-integration-tests --enable-valgrind --enable-debug
     - name: build
       run:  make clean install   
-    - name: tests
+    - name: test_storage_mock_rbox
       run:  valgrind src/tests/test_storage_mock_rbox_bugs   
+    - name: test_utils
+      run: valgrind src/tests/test_librmb_utils

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.0.50](https://github.com/ceph-dovecot/dovecot-ceph-plugin/tree/0.0.50) (2023-02-02)
+- fix: cleanup ceph-index size calculation
+
 ## [0.0.49](https://github.com/ceph-dovecot/dovecot-ceph-plugin/tree/0.0.49) (2023-01-29)
 - fix: cleanup ceph-index in case of mailbox INBOX delete
 

configure.ac

@@ -9,7 +9,7 @@
 AC_PREREQ([2.59])
 
 
-AC_INIT([dovecot-ceph-plugin], [0.0.49], [https://github.com/ceph-dovecot/dovecot-ceph-plugin/issues/new], ,[https://github.com/ceph-dovecot/dovecot-ceph-plugin])
+AC_INIT([dovecot-ceph-plugin], [0.0.50], [https://github.com/ceph-dovecot/dovecot-ceph-plugin/issues/new], ,[https://github.com/ceph-dovecot/dovecot-ceph-plugin])
 
 
 AC_CONFIG_AUX_DIR([.])

rpm/dovecot-ceph-plugin.spec

@@ -14,8 +14,7 @@
 Name:		dovecot-ceph-plugin
 Summary:	Dovecot Ceph RADOS plugins
 
-Version:	0.0.49
-
+Version:	0.0.50
 
 Release:	0%{?dist}
 URL:		https://github.com/ceph-dovecot/dovecot-ceph-plugin

src/librmb/rados-util.cpp

@@ -389,4 +389,14 @@ namespace librmb {
     }
     return index;
   }
+
+  static double RadosUtils::object_size_percent(const double object_size, const double max_object_size) {
+      double ceph_index_size_percent = ( object_size / max_object_size ) * (double) 100.0;
+      return ceph_index_size_percent;
+  }
+
+  static bool RadosUtils::object_size_close_to_reach_max(const double object_size, const double max_object_size) {
+      return RadosUtils::object_size_percent(object_size, max_object_size) > 80;
+  }
+
 }  // namespace librmb

src/librmb/rados-util.h

@@ -201,6 +201,8 @@ class RadosUtils {
   static std::string convert_to_ceph_index(const std::string &str);
 
   static std::set<std::string> ceph_index_to_set(const std::string &str);
+  static double object_size_percent(const double object_size, const double max_object_size);
+  static bool object_size_close_to_reach_max(const double object_size, const double max_object_size);
 };
 
 }  // namespace librmb

src/storage-rbox/rbox-save.cpp

@@ -653,18 +653,18 @@ int rbox_save_finish(struct mail_save_context *_ctx) {
         i_error("saved mail: %s failed. Metadata_count %ld, mail_size (%d)", r_ctx->rados_mail->get_oid()->c_str(),
                 r_ctx->rados_mail->get_metadata()->size(), r_ctx->rados_mail->get_mail_size());
       }else{
-
         if( r_storage->config->get_object_search_method() == 2){
           // ceph config schalter an oder aus!
-          r_storage->s->ceph_index_append(*r_ctx->rados_mail->get_oid());
-          uint64_t index_size = r_storage->s->ceph_index_size();                  
-          double ceph_index_size_percent = ((double)index_size / (double)r_storage->s->get_max_object_size()) *(double)100.0;
-          // WARN if index reaches 80% of max object size
-          if( ceph_index_size_percent > 0.80) {
-            i_warning("ceph_index file(%d) close to exceed max_object size(%d), recalc index !", index_size, r_storage->s->get_max_object_size() );
+          r_storage->s->ceph_index_append(*r_ctx->rados_mail->get_oid());                    
+          if( librmb::RadosUtils::object_size_close_to_reach_max(
+                                                                 (double)r_storage->s->ceph_index_size(), 
+                                                                 (double) r_storage->s->get_max_object_size())
+                                                                ) {
+            i_warning("ceph_index file(%d) close to exceed max_object size(%d) 80%, recalc index !", r_storage->s->ceph_index_size(), r_storage->s->get_max_object_size() );
           }
         }
       }
+
       if (r_storage->save_log->is_open()) {
         r_storage->save_log->append(
             librmb::RadosSaveLogEntry(*r_ctx->rados_mail->get_oid(), r_storage->s->get_namespace(),

src/tests/librmb/test_librmb_utils.cpp

@@ -290,57 +290,6 @@ __attribute__((noreturn)) static void *write_to_save_file(void *threadid) {
 
   pthread_exit(NULL);
 }
-TEST(librmb, append_to_existing_file_multi_threading) {
-  std::string test_file_name = "test1.log";
-  int rc;
-  void *status;
-  pthread_attr_t attr;
-  pthread_t threads[5];
-  // Initialize and set thread joinable
-  pthread_attr_init(&attr);
-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-
-  for (uintptr_t i = 0; i < 5; i++) {
-    rc = pthread_create(&threads[i], NULL, write_to_save_file, (void *)i);
-  }
-  sleep(1);
-  std::cout << " threads created " << std::endl;
-  // free attribute and wait for the other threads
-  pthread_attr_destroy(&attr);
-  for (int i = 0; i < 5; i++) {
-    rc = pthread_join(threads[i], &status);
-    if (rc) {
-      std::cout << "Error:unable to join," << rc << std::endl;
-      exit(-1);
-    }
-
-    std::cout << "Main: completed thread id :" << i;
-    std::cout << "  exiting with status :" << status << std::endl;
-  }
-  sleep(1);
-  int line_count = 0;
-  /** check content **/
-  std::ifstream read(test_file_name);
-  while (true) {
-    librmb::RadosSaveLogEntry entry;
-    read >> entry;
-
-    if (read.eof()) {
-      break;
-    }
-    EXPECT_EQ(entry.oid, "abc");
-    EXPECT_EQ(entry.ns, "ns_1");
-    EXPECT_EQ(entry.pool, "mail_storage");
-    EXPECT_EQ(entry.op, "save");
-    line_count++;
-  }
-  EXPECT_EQ(25, line_count);
-  read.close();
-  std::remove(test_file_name.c_str());
-
-  std::cout << " exiting main " << std::endl;
-  // pthread_exit(NULL);
-}
 
 TEST(librmb, test_mvn_option) {
   std::list<librmb::RadosMetadata *> metadata;
@@ -377,18 +326,33 @@ TEST(librmb, test_mvn_option) {
   std::remove(test_file_name.c_str());
 }
 
-/*TEST(librmb, test_if) {
-  int arr[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+TEST(librmb, test_max_object_size_calculation) {
+
+    bool result = librmb::RadosUtils::object_size_close_to_reach_max(10.0,100.0);
+    EXPECT_EQ(result, false);
+
+    result = librmb::RadosUtils::object_size_close_to_reach_max(81.0,100.0);
+    EXPECT_EQ(result, true);
+
+    result = librmb::RadosUtils::object_size_close_to_reach_max(112820433.0
+                                                               ,134217728.0);
+    EXPECT_EQ(result, true);
+
+    result = librmb::RadosUtils::object_size_close_to_reach_max(13646193.0
+                                                               ,134217728.0);
+    EXPECT_EQ(result, false);
+
+    result = librmb::RadosUtils::object_size_close_to_reach_max(13646226.0
+                                                               ,134217728.0);
+    EXPECT_EQ(result, false);
+
+    result = librmb::RadosUtils::object_size_close_to_reach_max(13646259.0
+                                                               ,134217728.0);
+    EXPECT_EQ(result, false);
+
+}
 
-  for (int i = 0; i < 10; ++i) {
-    std::cout << " value: " << arr[i] << std::endl;
-  }
-  for (int i = 0; i < 10; i++) {
-    std::cout << " value: " << arr[i] << std::endl;
-  }
 
-  EXPECT_EQ(1, 2);
-}*/
 TEST(librmb, mock_obj) {}
 int main(int argc, char **argv) {
   ::testing::InitGoogleMock(&argc, argv);