Merge PR ceph#22612 into master

* refs/pull/22612/head: kv/RocksDBStore: Don't use sync mode when disableWAL is set. Reviewed-by: Sage Weil <[email protected]>
rouming · Jan 15, 2019 · 0334cc1 · 0334cc1
2 parents f1505a0 + 647e0d8
commit 0334cc1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
@@ -823,7 +823,8 @@ int RocksDBStore::submit_transaction_sync(KeyValueDB::Transaction t)
 {
   utime_t start = ceph_clock_now();
   rocksdb::WriteOptions woptions;
-  woptions.sync = true;
+  // if disableWAL, sync can't set
+  woptions.sync = !disableWAL;
 
   int result = submit_common(woptions, t);