From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 9 Apr 2015 03:39:08 +0000 (+0800)
Subject: common: make rados bench return correctly errno.
X-Git-Tag: v9.0.2~193^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3d62a9d4c6da7bd48f7aefce91db050bdc9a637;p=ceph.git

common: make rados bench return correctly errno.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index e0cc56dfe785..179f5b954ba6 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -487,7 +487,7 @@ int ObjBencher::write_bench(int secondsToRun, int maxObjectsToCreate,
   lock.Unlock();
   pthread_join(print_thread, NULL);
   delete newContents;
-  return -5;
+  return r;
 }
 
 int ObjBencher::seq_read_bench(int seconds_to_run, int num_objects, int concurrentios, int pid) {
@@ -674,7 +674,7 @@ int ObjBencher::seq_read_bench(int seconds_to_run, int num_objects, int concurre
   data.done = 1;
   lock.Unlock();
   pthread_join(print_thread, NULL);
-  return -5;
+  return r;
 }
 
 int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurrentios, int pid)
@@ -865,7 +865,7 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
   data.done = 1;
   lock.Unlock();
   pthread_join(print_thread, NULL);
-  return -5;
+  return r;
 }
 
 int ObjBencher::clean_up(const char* prefix, int concurrentios, const char* run_name) {
@@ -1022,7 +1022,7 @@ int ObjBencher::clean_up(int num_objects, int prevPid, int concurrentios) {
   lock.Lock();
   data.done = 1;
   lock.Unlock();
-  return -5;
+  return r;
 }
 
 /**