*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@324 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/Makefile b/ceph/Makefile
index 00428ce27023dc7c9924101e2d5dda8a200dfa43..fb9b084a0d979be3e3f47f05964dabe2f69d1a14 100644 (file)
--- a/ceph/Makefile
+++ b/ceph/Makefile
@@ -8,10 +8,20 @@
 # This makes it less annoying to build on non-mpi hosts for dev work, and seems to 
 # behave just fine...  change ${CC} back to mpicxx if you get paranoid.
 CC = g++
-MPICC = mpicxx
 CFLAGS = -g -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE
 LIBS = -lpthread 
 
+#for normal machines
+MPICC = mpicxx
+MPICFLAGS = ${CFLAGS}
+MPILIBS = ${LIBS}
+
+#for LLNL boxes without mpicxx
+#MPICC = g++
+#MPICFLAGS = ${CFLAGS} -I/usr/lib/mpi/include -L/usr/lib/mpi/mpi_gnu/lib
+#MPILIBS = ${LIBS} -lelan -lmpi
+
+
 MDS_OBJS= \
        mds/MDS.o\
        mds/MDCache.o\
@@ -78,7 +88,7 @@ mpifuse: mpifuse.cc mds/allmds.o client/Client.o client/SyntheticClient.o osd/OS
        ${MPICC} ${CFLAGS} ${LIBS} -lfuse $^ -o $@
 
 mpisyn: mpisyn.cc mds/allmds.o client/Client.o client/SyntheticClient.o osd/OSD.o msg/MPIMessenger.cc msg/CheesySerializer.o ${COMMON_OBJS}
-       ${MPICC} ${CFLAGS} ${LIBS} -lfuse $^ -o $@
+       ${MPICC} ${MPICFLAGS} ${MPILIBS} $^ -o $@
 
 fakesyn: fakesyn.cc mds/allmds.o client/Client.o client/SyntheticClient.o osd/OSD.o msg/FakeMessenger.o msg/CheesySerializer.o ${COMMON_OBJS}
        ${CC} -pg ${CFLAGS} ${LIBS} $^ -o $@

diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc
index 9c03f83a07084e50c8ae45936fa96ed378c1bab0..557e9997aa07209edd3797d47a6ceab2f408ea51 100644 (file)
--- a/ceph/osd/OSD.cc
+++ b/ceph/osd/OSD.cc
@@ -222,6 +222,7 @@ void OSD::handle_op(MOSDOp *op)
 
 
   // am i the right rg_role?
+  if (0) {
   repgroup_t rg = op->get_rg();
   if (op->get_rg_role() == 0) {
        // PRIMARY
@@ -244,7 +245,7 @@ void OSD::handle_op(MOSDOp *op)
          assert(0); 
        }
   }
-
+  }