From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Thu, 18 Jun 2015 04:36:45 +0000 (+0800)
Subject: osd: no need to check current hitset object is degraded when persisting
X-Git-Tag: v9.1.0~329^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5812adb6c86660e5ae6fa30baa70480d8fc52052;p=ceph.git

osd: no need to check current hitset object is degraded when persisting
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>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 548ac8121eed..f100a2f53ad7 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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;