diff --git a/debian/ceph.prerm b/debian/ceph.prerm index 17f8bcc3097..ad509223cbc 100644 --- a/debian/ceph.prerm +++ b/debian/ceph.prerm @@ -12,6 +12,13 @@ invoke-rc.d ceph-all stop || { fi } +invoke-rc.d ceph stop || { + RESULT=$? + if [ $RESULT != 100 ]; then + exit $RESULT + fi +} + #DEBHELPER# exit 0 diff --git a/src/os/LevelDBStore.cc b/src/os/LevelDBStore.cc index 612063cf481..ff6c557574d 100644 --- a/src/os/LevelDBStore.cc +++ b/src/os/LevelDBStore.cc @@ -34,14 +34,15 @@ int LevelDBStore::init(ostream &out, bool create_if_missing) assert(0 == "bloom size set but installed leveldb doesn't support bloom filters"); #endif } - if (!options.compression_enabled) + if (options.compression_enabled) + ldoptions.compression = leveldb::kSnappyCompression; + else ldoptions.compression = leveldb::kNoCompression; if (options.block_restart_interval) ldoptions.block_restart_interval = options.block_restart_interval; ldoptions.error_if_exists = options.error_if_exists; ldoptions.paranoid_checks = options.paranoid_checks; - ldoptions.compression = leveldb::kNoCompression; ldoptions.create_if_missing = create_if_missing; if (options.log_file.length()) {