fixed

diff --git a/src/include/encoding.h b/src/include/encoding.h
index 3c13b011f0ba4e4c759e8106f71a4ea36c16fb9e..f86797a5100ca65858d2d0c9a42a703dc6a16a59 100644 (file)
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -35,8 +35,8 @@ inline void decode_raw(T& t, bufferlist::iterator &p)
 }
 
 #define WRITE_RAW_ENCODER(type)                                                \
-  inline void encode(type v, bufferlist& bl) { encode_raw(v, bl); }    \
-  inline void decode(type v, bufferlist::iterator& p) { decode_raw(v, p); }
+  inline void encode(const type &v, bufferlist& bl) { encode_raw(v, bl); } \
+  inline void decode(type &v, bufferlist::iterator& p) { decode_raw(v, p); }
 
 WRITE_RAW_ENCODER(__u8)
 WRITE_RAW_ENCODER(__s8)

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 56555ac3aa2ab9196ada54bd5165bbd8c3d76965..f41e6412d3fc607eddf2bb2d14a498889bfe92e4 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -323,7 +323,10 @@ private:
   }
 
   void apply_incremental(Incremental &inc) {
-    assert(ceph_fsid_equal(&inc.fsid, &fsid) || inc.epoch == 1);
+    if (inc.epoch == 1)
+      fsid = inc.fsid;
+    else
+      assert(ceph_fsid_equal(&inc.fsid, &fsid));
     assert(inc.epoch == epoch+1);
     epoch++;
     ctime = inc.ctime;

diff --git a/src/start.sh b/src/start.sh
index 3bed77c77e1a1fbfcefbaa16cbbafa212fcc40db..59df31d5b1299539384f07c81eada24a97b0e991 100755 (executable)
--- a/src/start.sh
+++ b/src/start.sh
@@ -32,6 +32,7 @@ ARGS="-d --bind $IP -o out"
 # start monitor
 $CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
 
+
 # build and inject an initial osd map
 $CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
 $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap