]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: fix submit_transaction rval checks
authorSage Weil <sage@redhat.com>
Sat, 30 Apr 2016 02:10:27 +0000 (22:10 -0400)
committerSage Weil <sage@redhat.com>
Sat, 30 Apr 2016 02:18:09 +0000 (22:18 -0400)
No side-effects in assert.

Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc

index 13ea8aacaddb9eaf04ec2f59c8bed96277a582fd..b8873afde6a150344d5f94a5e311c15345d17d24 100644 (file)
@@ -3679,11 +3679,13 @@ void BlueStore::_txc_state_proc(TransContext *txc)
       if (!g_conf->bluestore_sync_transaction) {
        if (g_conf->bluestore_sync_submit_transaction) {
          _txc_update_fm(txc);
-         assert(0 == db->submit_transaction(txc->t));
+         int r = db->submit_transaction(txc->t);
+         assert(r == 0);
        }
       } else {
        _txc_update_fm(txc);
-       assert(0 == db->submit_transaction_sync(txc->t));
+       int r = db->submit_transaction_sync(txc->t);
+       assert(r == 0);
       }
       {
        std::lock_guard<std::mutex> l(kv_lock);
@@ -3983,7 +3985,8 @@ void BlueStore::_kv_sync_thread()
             it != kv_committing.end();
             ++it) {
          _txc_update_fm((*it));
-         assert(0 == db->submit_transaction((*it)->t));
+         int r = db->submit_transaction((*it)->t);
+         assert(r == 0);
        }
       }
 
@@ -4049,7 +4052,8 @@ void BlueStore::_kv_sync_thread()
        get_wal_key(wt.seq, &key);
        t->rm_single_key(PREFIX_WAL, key);
       }
-      assert(0 == db->submit_transaction_sync(t));
+      int r = db->submit_transaction_sync(t);
+      assert(r == 0);
 
       utime_t finish = ceph_clock_now(NULL);
       utime_t dur = finish - start;