Merge pull request ceph#50651 from rosinL/cleanup

yuriw · web-flow · commit b2ec2aff8015 · 2023-06-05T11:32:51.000-04:00
Cleanup the LevelDB residue


Reviewed-by: Radoslaw Zarzynski &lt;rzarzyns@redhat.com&gt;
diff --git a/README.md b/README.md
@@ -94,8 +94,7 @@ defaulted to ON. To build without the RADOS Gateway:
 Another example below is building with debugging and alternate locations 
 for a couple of external dependencies:
 
-	cmake -DLEVELDB_PREFIX="/opt/hyperleveldb" \
-	-DCMAKE_INSTALL_PREFIX=/opt/ceph -DCMAKE_C_FLAGS="-Og -g3 -gdwarf-4" \
+	cmake -DCMAKE_INSTALL_PREFIX=/opt/ceph -DCMAKE_C_FLAGS="-Og -g3 -gdwarf-4" \
 	..
 
 Ceph has several bundled dependencies such as Boost, RocksDB and Arrow. By
diff --git a/doc/install/install-storage-cluster.rst b/doc/install/install-storage-cluster.rst
@@ -63,7 +63,7 @@ To install Ceph with RPMs, execute the following steps:
 
 #. Install pre-requisite packages::  
 
-	sudo yum install snappy leveldb gdisk python-argparse gperftools-libs
+	sudo yum install snappy gdisk python-argparse gperftools-libs
 
 
 Once you have added either release or development packages, or added a
diff --git a/doc/man/8/ceph-kvstore-tool.rst b/doc/man/8/ceph-kvstore-tool.rst
@@ -9,14 +9,14 @@
 Synopsis
 ========
 
-| **ceph-kvstore-tool** <leveldb|rocksdb|bluestore-kv> <store path> *command* [args...]
+| **ceph-kvstore-tool** <rocksdb|bluestore-kv> <store path> *command* [args...]
 
 
 Description
 ===========
 
 :program:`ceph-kvstore-tool` is a kvstore manipulation tool. It allows users to manipulate
-leveldb/rocksdb's data (like OSD's omap) offline.
+RocksDB's data (like OSD's omap) offline.
 
 Commands
 ========
diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
@@ -161,7 +161,7 @@ Usage::
 compact
 -------
 
-Causes compaction of monitor's leveldb storage.
+Causes compaction of monitor's RocksDB storage.
 
 Usage::
 
diff --git a/doc/rados/configuration/mon-config-ref.rst b/doc/rados/configuration/mon-config-ref.rst
@@ -38,7 +38,7 @@ the monitor services are written by the Ceph Monitor to a single Paxos
 instance, and Paxos writes the changes to a key/value store for strong
 consistency. Ceph Monitors are able to query the most recent version of the
 cluster map during sync operations, and they use the key/value store's
-snapshots and iterators (using leveldb) to perform store-wide synchronization.
+snapshots and iterators (using RocksDB) to perform store-wide synchronization.
 
 .. ditaa::
  /-------------\               /-------------\
@@ -265,7 +265,7 @@ Data
 
 Ceph provides a default path where Ceph Monitors store data. For optimal
 performance in a production Ceph Storage Cluster, we recommend running Ceph
-Monitors on separate hosts and drives from Ceph OSD Daemons. As leveldb uses
+Monitors on separate hosts and drives from Ceph OSD Daemons. As RocksDB uses
 ``mmap()`` for writing the data, Ceph Monitors flush their data from memory to disk
 very often, which can interfere with Ceph OSD Daemon workloads if the data
 store is co-located with the OSD Daemons.
diff --git a/doc/rados/operations/health-checks.rst b/doc/rados/operations/health-checks.rst
@@ -127,8 +127,8 @@ Monitor databases might grow in size when there are placement groups that have
 not reached an ``active+clean`` state in a long time.
 
 This alert might also indicate that the monitor's database is not properly
-compacting, an issue that has been observed with some older versions of leveldb
-and rocksdb. Forcing a compaction with ``ceph daemon mon.<id> compact`` might
+compacting, an issue that has been observed with some older versions of
+RocksDB. Forcing a compaction with ``ceph daemon mon.<id> compact`` might
 shrink the database's on-disk size.
 
 This alert might also indicate that the monitor has a bug that prevents it from
diff --git a/doc/rados/troubleshooting/log-and-debug.rst b/doc/rados/troubleshooting/log-and-debug.rst
@@ -318,8 +318,6 @@ to their default level or to a level suitable for normal operations.
 +--------------------------+-----------+--------------+
 | ``rocksdb``              |     4     |      5       |
 +--------------------------+-----------+--------------+
-| ``leveldb``              |     4     |      5       |
-+--------------------------+-----------+--------------+
 | ``fuse``                 |     1     |      5       |
 +--------------------------+-----------+--------------+
 | ``mgr``                  |     2     |      5       |
diff --git a/doc/rados/troubleshooting/troubleshooting-mon.rst b/doc/rados/troubleshooting/troubleshooting-mon.rst
@@ -438,7 +438,7 @@ Monitor Store Failures
 Symptoms of store corruption
 ----------------------------
 
-Ceph monitor stores the :term:`Cluster Map` in a key/value store such as LevelDB. If
+Ceph monitor stores the :term:`Cluster Map` in a key/value store such as RocksDB. If
 a monitor fails due to the key/value store corruption, following error messages
 might be found in the monitor log::
 
diff --git a/doc/radosgw/layout.rst b/doc/radosgw/layout.rst
@@ -132,8 +132,6 @@ Footnotes
 to how Extended Attributes associate with a POSIX file. An object's omap
 is not physically located in the object's storage, but its precise
 implementation is invisible and immaterial to RADOS Gateway.
-In Hammer, LevelDB is used to store omap data within each OSD; later releases
-default to RocksDB but can be configured to use LevelDB.
 
 [2] Before the Dumpling release, the 'bucket.instance' metadata did not
 exist and the 'bucket' metadata contained its information. It is possible
diff --git a/install-deps.sh b/install-deps.sh
@@ -351,7 +351,6 @@ if [ x$(uname)x = xFreeBSDx ]; then
         devel/libtool \
         devel/google-perftools \
         lang/cython \
-        databases/leveldb \
         net/openldap24-client \
         archivers/snappy \
         archivers/liblz4 \
diff --git a/qa/suites/perf-basic/settings/optimized.yaml b/qa/suites/perf-basic/settings/optimized.yaml
@@ -69,7 +69,6 @@ overrides:
         debug bdev: "0/0"
         debug kstore: "0/0"
         debug rocksdb: "0/0"
-        debug leveldb: "0/0"
         debug memdb: "0/0"
         debug fuse: "0/0"
         debug mgr: "0/0"
diff --git a/qa/suites/rados/perf/settings/optimized.yaml b/qa/suites/rados/perf/settings/optimized.yaml
@@ -65,7 +65,6 @@ overrides:
         debug bdev: "0/0"
         debug kstore: "0/0"
         debug rocksdb: "0/0"
-        debug leveldb: "0/0"
         debug memdb: "0/0"
         debug fuse: "0/0"
         debug mgr: "0/0"
diff --git a/qa/tasks/rebuild_mondb.py b/qa/tasks/rebuild_mondb.py
@@ -1,6 +1,6 @@
 """
-Test if we can recover the leveldb from OSD after where all leveldbs are
-corrupted
+Test that we can rebuild the mon RocksDB from OSD data if all mon DBs are
+corrupted or lost
 """
 
 import logging
@@ -90,14 +90,14 @@ def _rebuild_db(ctx, manager, cluster_name, mon, mon_id, keyring_path):
             log.info('collecting maps from {cluster}:osd.{osd}'.format(
                 cluster=cluster,
                 osd=osd_id))
-            # push leveldb to OSD
+            # push RocksDB to OSD
             osd_mstore = os.path.join(teuthology.get_testdir(ctx), 'mon-store')
             osd.run(args=['sudo', 'mkdir', '-m', 'o+x', '-p', osd_mstore])
 
             _push_directory(local_mstore, osd, osd_mstore)
             log.info('rm -rf {0}'.format(local_mstore))
             shutil.rmtree(local_mstore)
-            # update leveldb with OSD data
+            # update RocksDB with OSD data
             options = '--no-mon-config --op update-mon-db --mon-store-path {0}'
             log.info('cot {0}'.format(osd_mstore))
             manager.objectstore_tool(pool=None,
@@ -113,7 +113,7 @@ def _rebuild_db(ctx, manager, cluster_name, mon, mon_id, keyring_path):
             osd.run(args=['sudo', 'rm', '-fr', osd_mstore])
 
     # recover the first_mon with re-built mon db
-    # pull from recovered leveldb from client
+    # pull from recovered RocksDB from client
     mon_store_dir = os.path.join('/var/lib/ceph/mon',
                                  '{0}-{1}'.format(cluster_name, mon_id))
     _push_directory(local_mstore, mon, mon_store_dir)
diff --git a/qa/valgrind.supp b/qa/valgrind.supp
@@ -198,20 +198,6 @@
 	fun:*set_flush_on_exit*
 	...
 }
-{
-	libleveldb: ignore all static leveldb leaks
-	Memcheck:Leak
-	...
-	fun:*leveldb*
-	...
-}
-{
-	libleveldb: ignore all dynamic libleveldb leaks
-	Memcheck:Leak
-	...
-	obj:*libleveldb.so*
-	...
-}
 {
 	libcurl: ignore libcurl leaks
 	Memcheck:Leak
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
@@ -272,25 +272,14 @@ int main(int argc, const char **argv)
 
   // We need to specify some default values that may be overridden by the
   // user, that are specific to the monitor.  The options we are overriding
-  // are also used on the OSD (or in any other component that uses leveldb),
-  // so changing the global defaults is not an option.
+  // are also used on the OSD, so changing the global defaults is not an option.
   // This is not the prettiest way of doing this, especially since it has us
   // having a different place defining default values, but it's not horribly
   // wrong enough to prevent us from doing it :)
   //
   // NOTE: user-defined options will take precedence over ours.
-  //
-  //  leveldb_write_buffer_size = 32*1024*1024  = 33554432  // 32MB
-  //  leveldb_cache_size        = 512*1024*1204 = 536870912 // 512MB
-  //  leveldb_block_size        = 64*1024       = 65536     // 64KB
-  //  leveldb_compression       = false
-  //  leveldb_log               = ""
+
   map<string,string> defaults = {
-    { "leveldb_write_buffer_size", "33554432" },
-    { "leveldb_cache_size", "536870912" },
-    { "leveldb_block_size", "65536" },
-    { "leveldb_compression", "false"},
-    { "leveldb_log", "" },
     { "keyring", "$mon_data/keyring" },
   };
 
@@ -589,8 +578,6 @@ int main(int argc, const char **argv)
     }
   }
 
-  // we fork early to prevent leveldb's environment static state from
-  // screwing us over
   Preforker prefork;
   if (!(flags & CINIT_FLAG_NO_DAEMON_ACTIONS)) {
     if (global_init_prefork(g_ceph_context) >= 0) {
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
@@ -129,13 +129,8 @@ int main(int argc, const char **argv)
     exit(0);
   }
 
-  map<string,string> defaults = {
-    // We want to enable leveldb's log, while allowing users to override this
-    // option, therefore we will pass it as a default argument to global_init().
-    { "leveldb_log", "" }
-  };
   auto cct = global_init(
-    &defaults,
+    nullptr,
     args, CEPH_ENTITY_TYPE_OSD,
     CODE_ENVIRONMENT_DAEMON, 0);
   ceph_heap_profiler_init();
diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
@@ -2058,7 +2058,6 @@ options:
   services:
   - mon
   enum_values:
-  - leveldb
   - rocksdb
   flags:
   - create
@@ -3361,56 +3360,6 @@ options:
   level: advanced
   default: 2
   with_legacy: true
-- name: leveldb_log_to_ceph_log
-  type: bool
-  level: advanced
-  default: true
-  with_legacy: true
-- name: leveldb_write_buffer_size
-  type: size
-  level: advanced
-  default: 8_M
-  with_legacy: true
-- name: leveldb_cache_size
-  type: size
-  level: advanced
-  default: 128_M
-  with_legacy: true
-- name: leveldb_block_size
-  type: size
-  level: advanced
-  default: 0
-  with_legacy: true
-- name: leveldb_bloom_size
-  type: int
-  level: advanced
-  default: 0
-  with_legacy: true
-- name: leveldb_max_open_files
-  type: int
-  level: advanced
-  default: 0
-  with_legacy: true
-- name: leveldb_compression
-  type: bool
-  level: advanced
-  default: true
-  with_legacy: true
-- name: leveldb_paranoid
-  type: bool
-  level: advanced
-  default: false
-  with_legacy: true
-- name: leveldb_log
-  type: str
-  level: advanced
-  default: /dev/null
-  with_legacy: true
-- name: leveldb_compact_on_mount
-  type: bool
-  level: advanced
-  default: false
-  with_legacy: true
 - name: rocksdb_log_to_ceph_log
   type: bool
   level: advanced
diff --git a/src/common/options/mon.yaml.in b/src/common/options/mon.yaml.in
@@ -1092,7 +1092,7 @@ options:
   default: true
   services:
   - mon
-# compact leveldb on ceph-mon start
+# compact RocksDB on ceph-mon start
 - name: mon_compact_on_start
   type: bool
   level: advanced
@@ -1104,7 +1104,7 @@ options:
     monitor database and improve the performance of it if the regular
     compaction fails to work.
   with_legacy: true
-# trigger leveldb compaction on bootstrap
+# trigger RocksDB compaction on bootstrap
 - name: mon_compact_on_bootstrap
   type: bool
   level: advanced
diff --git a/src/common/subsys.h b/src/common/subsys.h
@@ -74,7 +74,6 @@ SUBSYS(bluefs, 1, 5)
 SUBSYS(bdev, 1, 3)
 SUBSYS(kstore, 1, 5)
 SUBSYS(rocksdb, 4, 5)
-SUBSYS(leveldb, 4, 5)
 SUBSYS(fuse, 1, 5)
 SUBSYS(mgr, 2, 5)
 SUBSYS(mgrc, 1, 5)
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
@@ -209,7 +209,7 @@ COMMAND("auth rm "
 /*
  * Monitor commands (Monitor.cc)
  */
-COMMAND_WITH_FLAG("compact", "cause compaction of monitor's leveldb/rocksdb storage",
+COMMAND_WITH_FLAG("compact", "cause compaction of monitor's RocksDB storage",
 	     "mon", "rw",
              FLAG(TELL))
 COMMAND("fsid", "show cluster FSID/UUID", "mon", "r")
diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h
@@ -664,8 +664,8 @@ class MonitorDBStore
     std::string kv_type;
     int r = read_meta("kv_backend", &kv_type);
     if (r < 0 || kv_type.empty()) {
-      // assume old monitors that did not mark the type were leveldb.
-      kv_type = "leveldb";
+      // assume old monitors that did not mark the type were RocksDB.
+      kv_type = "rocksdb";
       r = write_meta("kv_backend", kv_type);
       if (r < 0)
 	return r;
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
@@ -82,7 +82,7 @@ class PaxosService {
   health_check_map_t health_checks;
 protected:
   /**
-   * format of our state in leveldb, 0 for default
+   * format of our state in RocksDB, 0 for default
    */
   version_t format_version;
 
diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h
diff --git a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
diff --git a/src/test/cli/ceph-kvstore-tool/help.t b/src/test/cli/ceph-kvstore-tool/help.t
diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc
diff --git a/src/test/libcephfs_config.cc b/src/test/libcephfs_config.cc
diff --git a/src/test/librados/librados_config.cc b/src/test/librados/librados_config.cc
diff --git a/src/tools/ceph-dencoder/osd_types.h b/src/tools/ceph-dencoder/osd_types.h
diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
diff --git a/src/tools/kvstore_tool.cc b/src/tools/kvstore_tool.cc
