]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: update last_epoch_clean in PG::Info::History::merge()
authorSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 22:08:06 +0000 (15:08 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 22:15:12 +0000 (15:15 -0700)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/osd/PG.h

index 9389acb2c0ff4b19c1f2cba4bfe34da5b4e3a64e..985cd95fec3d63e6a625066f813d357bc2779bb2 100644 (file)
@@ -202,6 +202,8 @@ public:
          epoch_created = other.epoch_created;
        if (last_epoch_started < other.last_epoch_started)
          last_epoch_started = other.last_epoch_started;
+       if (last_epoch_clean < other.last_epoch_clean)
+         last_epoch_clean = other.last_epoch_clean;
        if (last_epoch_split < other.last_epoch_started)
          last_epoch_split = other.last_epoch_started;
        if (other.last_scrub > last_scrub)