RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 14:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	debian/ceph.prerm
This commit is contained in:
Sage Weil 2013-05-21 08:26:57 -07:00
commit bbcbab448b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/ceph.prerm vendored
View File

@ -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

5
src/os/LevelDBStore.cc
View File

@ -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()) {