From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Feb 2014 18:27:23 +0000 (-0800)
Subject: client: disable barrier support
X-Git-Tag: v0.78~167^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1254%2Fhead;p=ceph.git

client: disable barrier support

The boost interval_set class is not available on centos6/rhel6.  Until that
dependency is sorted out, fix the build.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d8f90eb73c88..a68c8443f467 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -8222,7 +8222,7 @@ int Client::ll_write_block(Inode *in, uint64_t blockid,
   if (length == 0) {
     return -EINVAL;
   }
-  if (sync) {
+  if (true || sync) {
     /* if write is stable, the epilogue is waiting on
      * flock */
     onack = new C_NoopContext;
@@ -8232,8 +8232,9 @@ int Client::ll_write_block(Inode *in, uint64_t blockid,
     /* if write is unstable, we just place a barrier for
      * future commits to wait on */
     onack = new C_NoopContext;
-    onsafe = new C_Block_Sync(this, vino.ino,
+    /*onsafe = new C_Block_Sync(this, vino.ino,
 			      barrier_interval(offset, offset + length), &r);
+    */
     done = true;
   }
   object_t oid = file_object_t(vino.ino, blockid);
@@ -8282,6 +8283,7 @@ int Client::ll_commit_blocks(Inode *in,
 			     uint64_t length)
 {
     Mutex::Locker lock(client_lock);
+    /*
     BarrierContext *bctx;
     vinodeno_t vino = ll_get_vino(in);
     uint64_t ino = vino.ino;
@@ -8298,7 +8300,7 @@ int Client::ll_commit_blocks(Inode *in,
       barrier_interval civ(offset, offset + length);
       p->second->commit_barrier(civ);
     }
-
+    */
     return 0;
 }
 
diff --git a/src/client/Client.h b/src/client/Client.h
index 5918739f3706..bd30c09492f4 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -35,7 +35,7 @@ using std::fstream;
 #include "include/interval_set.h"
 #include "include/lru.h"
 
-#include "barrier.h"
+//#include "barrier.h"
 
 #include "mds/mdstypes.h"
 
@@ -315,7 +315,7 @@ protected:
   ceph::unordered_map<inodeno_t,SnapRealm*> snap_realms;
 
   /* async block write barrier support */
-  map<uint64_t, BarrierContext* > barriers;
+  //map<uint64_t, BarrierContext* > barriers;
 
   SnapRealm *get_snap_realm(inodeno_t r);
   SnapRealm *get_snap_realm_maybe(inodeno_t r);
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index de0bfdba2001..53107eba5174 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,6 +1,5 @@
 libclient_la_SOURCES = \
 	client/Client.cc \
-	client/barrier.cc \
 	client/Inode.cc \
 	client/Dentry.cc \
 	client/MetaRequest.cc \
@@ -21,7 +20,6 @@ noinst_HEADERS += \
 	client/ClientSnapRealm.h \
 	client/SyntheticClient.h \
 	client/Trace.h \
-	client/barrier.h \
 	client/ioctl.h \
 	client/ObjecterWriteback.h