From: Chendi Xue <chendi.xue@intel.com>
Date: Tue, 19 Jan 2016 07:35:46 +0000 (+0800)
Subject: Add error check for object_map->sync()
X-Git-Tag: v10.0.4~162^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dece3be59a6fdf8e8c071f2824bc23a2c3c3dc05;p=ceph.git

Add error check for object_map->sync()

There lacks error check after doing object_map->sync under
sync_entry, which is OK when omap deployed in the same device
with object data, but it is better to add error check in case
object_map->sync failed.

Signed-off-by: Chendi Xue <chendi.xue@intel.com>
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 5cb73e7b01a32..7aa64ebffe5c5 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -3692,8 +3692,13 @@ void FileStore::sync_entry()
 	apply_manager.commit_started();
 	op_tp.unpause();
 
-	object_map->sync();
-	int err = backend->syncfs();
+	int err = object_map->sync();
+	if (err < 0) {
+	  derr << "object_map sync got " << cpp_strerror(err) << dendl;
+	  assert(0 == "object_map sync returned error");
+	}
+
+	err = backend->syncfs();
 	if (err < 0) {
 	  derr << "syncfs got " << cpp_strerror(err) << dendl;
 	  assert(0 == "syncfs returned error");