]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove a ceph_assert() from a legitimate path 40226/head
authorRonen Friedman <rfriedma@redhat.com>
Wed, 17 Mar 2021 15:21:10 +0000 (17:21 +0200)
committerNeha Ojha <nojha@redhat.com>
Thu, 18 Mar 2021 21:57:14 +0000 (21:57 +0000)
on_replica_init() might be legitimately called twice,
if the replica was waiting for updates to complete
before servicing the request.

Fixes: https://tracker.ceph.com/issues/49867
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 437456ecf9429dd5623cda105e1399234fcc86de)

src/osd/pg_scrubber.cc

index ecf2a3affc5b15cee208846075db02c6ba4eaaf2..9a5dba5085f78168461d3ab6118b310de73eba69 100644 (file)
@@ -807,7 +807,6 @@ void PgScrubber::on_init()
 
 void PgScrubber::on_replica_init()
 {
-  ceph_assert(!m_active);
   m_active = true;
 }