]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix val used in inode->last_journaled 5336/head
authorJohn Spray <john.spray@redhat.com>
Fri, 24 Jul 2015 08:37:15 +0000 (09:37 +0100)
committerJohn Spray <john.spray@redhat.com>
Fri, 24 Jul 2015 08:37:15 +0000 (09:37 +0100)
This was getting assigned with LogEvent::get_start_offset
on an uncommitted LogEvent, which is junk.  During replay
last_journaled is compared with the metablob's event_seq,
so that's what should be used here.

This change just from code inspection -- haven't seen this
manifest as an actual misbehaviour.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/Migrator.cc

index e7e0e0a39a72cb289f0a5bee08daf2bbfcc4ee95..eff1025a9af28922fbcc24f7a04e5ded26e850e9 100644 (file)
@@ -2932,7 +2932,8 @@ int Migrator::decode_import_dir(bufferlist::iterator& blp,
     else if (icode == 'I') {
       // inode
       assert(le);
-      decode_import_inode(dn, blp, oldauth, ls, le->get_start_off(), peer_exports, updated_scatterlocks);
+      decode_import_inode(dn, blp, oldauth, ls, le->get_metablob()->event_seq,
+          peer_exports, updated_scatterlocks);
     }
     
     // add dentry to journal entry