]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: no need to check current hitset object is degraded when persisting
authorZhiqiang Wang <zhiqiang.wang@intel.com>
Thu, 18 Jun 2015 04:36:45 +0000 (12:36 +0800)
committerZhiqiang Wang <zhiqiang.wang@intel.com>
Fri, 21 Aug 2015 07:48:20 +0000 (15:48 +0800)
hit set

The current hit set object doesn't exist yet. We are about to create it.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
src/osd/ReplicatedPG.cc

index 548ac8121eedbabb599fed63d99683a12b519f78..f100a2f53ad7f6146372e845e784738fb021faa1 100644 (file)
@@ -10711,11 +10711,6 @@ void ReplicatedPG::hit_set_persist()
   hobject_t oid;
   time_t flush_time = 0;
 
-  // See what start is going to be used later
-  utime_t start = info.hit_set.current_info.begin;
-  if (!start)
-     start = hit_set_start_stamp;
-
   // If any archives are degraded we skip this persist request
   // account for the additional entry being added below
   for (list<pg_hit_set_info_t>::iterator p = info.hit_set.history.begin();
@@ -10730,10 +10725,10 @@ void ReplicatedPG::hit_set_persist()
       return;
   }
 
+  utime_t start = info.hit_set.current_info.begin;
+  if (!start)
+     start = hit_set_start_stamp;
   oid = get_hit_set_archive_object(start, now);
-  // If the current object is degraded we skip this persist request
-  if (is_degraded_or_backfilling_object(oid))
-    return;
   if (scrubber.write_blocked_by_scrub(oid, get_sort_bitwise()))
     return;