PG: dout cleanup

Signed-off-by: Neha Ojha <nojha@redhat.com>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 2e071af905f1f4d17a220ba2651f4a015c567bba..7210cf61971b7d5c8bf277a02e23710166ebce40 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -904,16 +904,14 @@ void ECBackend::handle_sub_write(
     }
   }
   clear_temp_objs(op.temp_removed);
-  dout(10) << __func__ << " missing before " << get_parent()->get_log().get_missing().get_items() << dendl;
+  dout(30) << __func__ << " missing before " << get_parent()->get_log().get_missing().get_items() << dendl;
   pg_missing_tracker_t pmissing = get_parent()->get_local_missing();
   if (pmissing.is_missing(op.soid)) {
-    dout(10) << __func__ << " pmissing.is_missing(op.soid) " << pmissing.is_missing(op.soid) << dendl;
+    dout(30) << __func__ << " is_missing " << pmissing.is_missing(op.soid) << dendl;
     for (auto &&e: op.log_entries) {
-      dout(10) << " add_next_event entry " << e << dendl;
+      dout(30) << " add_next_event entry " << e << dendl;
       get_parent()->add_local_next_event(e);
-      dout(10) << " entry version " << e.version << dendl;
-      dout(10) << " entry prior version " << e.prior_version << dendl;
-      dout(10) << " entry is_delete " << e.is_delete() << dendl;
+      dout(30) << " entry is_delete " << e.is_delete() << dendl;
     }
   }
   get_parent()->log_operation(
@@ -940,7 +938,7 @@ void ECBackend::handle_sub_write(
   tls.push_back(std::move(op.t));
   tls.push_back(std::move(localt));
   get_parent()->queue_transactions(tls, msg);
-  dout(10) << __func__ << " missing after" << get_parent()->get_log().get_missing().get_items() << dendl;
+  dout(30) << __func__ << " missing after" << get_parent()->get_log().get_missing().get_items() << dendl;
 }
 
 void ECBackend::handle_sub_read(

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f15049cba24c9ca9168e462477cdec744da6d5b8..379d2817f441f861e49356242be603e1ec69dc07 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -458,9 +458,7 @@ void PG::proc_replica_log(
     dout(20) << " after missing " << i->first << " need " << i->second.need
             << " have " << i->second.have << dendl;
   }
-  dout(10) << __func__ << " peer_missing " << peer_missing[from].get_items() << dendl;
   peer_missing[from].claim(omissing);
-  dout(10) << __func__ << " peer_missing after claim" << peer_missing[from].get_items() << dendl;
 }
 
 bool PG::proc_replica_info(

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index f238c0579bf15185918074fced503ddb925a648a..e3035bc0d75aeaf52c927cda75ea634a76f587e3 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -1411,7 +1411,6 @@ public:
            }
          } else {
            ldpp_dout(dpp, 15) << "read_log_and_missing  missing " << *i << dendl;
-           ldpp_dout(dpp, 15) << " missing set " << missing.get_items() << dendl;
            if (debug_verify_stored_missing) {
              auto miter = missing.get_items().find(i->soid);
              if (i->is_delete()) {

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 9395a89a4a55e4b96025af105b07539010bc7675..9f89f4dd23042aae4b48a0de440697097d045712 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -658,7 +658,7 @@ bool PrimaryLogPG::is_degraded_on_async_recovery_target(const hobject_t& soid)
     if (peer_missing_entry != peer_missing.end() &&
         peer_missing_entry->second.get_items().count(soid) &&
         async_recovery_targets.count(peer)) {
-      dout(10) << __func__ << " " << soid << dendl;
+      dout(30) << __func__ << " " << soid << dendl;
       return true;
     }
   }
@@ -10087,11 +10087,6 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
     projected_log.add(entry);
   }
 
-  for (map<pg_shard_t, pg_missing_t>::iterator i = peer_missing.begin();
-           i != peer_missing.end();
-           ++i) {
-    dout(10) << __func__ << " shard " << i->first << " before missing " << (i->second).get_items() << dendl;
-  }
   bool requires_missing_loc = false;
   for (set<pg_shard_t>::iterator i = async_recovery_targets.begin();
        i != async_recovery_targets.end();
@@ -10103,12 +10098,6 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
     }
   }
 
-  for (map<pg_shard_t, pg_missing_t>::iterator i = peer_missing.begin();
-           i != peer_missing.end();
-           ++i) {
-    dout(10) << __func__ << " shard " << i->first << " after add next missing " << (i->second).get_items() << dendl;
-  }
-
   for (set<pg_shard_t>::const_iterator i = acting_recovery_backfill.begin();
        i != acting_recovery_backfill.end();
        ++i) {
@@ -10121,7 +10110,7 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
     }
   }
 
-  dout(10) << __func__ << " missing_loc before: " << missing_loc.get_locations(soid) << dendl;
+  dout(30) << __func__ << " missing_loc before: " << missing_loc.get_locations(soid) << dendl;
 
   if (requires_missing_loc) {
     // clear out missing_loc
@@ -10134,7 +10123,7 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
         missing_loc.add_location(soid, peer);
     }
   }
-  dout(10) << __func__ << " missing_loc after: " << missing_loc.get_locations(soid) << dendl;
+  dout(30) << __func__ << " missing_loc after: " << missing_loc.get_locations(soid) << dendl;
 
   pgbackend->submit_transaction(
     soid,

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 91a76f77108a6f95f3407278f400080fc92acb98..656ad6e06acf0ff63a77703144624dfcf01c6a83 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1004,7 +1004,7 @@ void ReplicatedBackend::do_repop(OpRequestRef op)
   // sanity checks
   assert(m->map_epoch >= get_info().history.same_interval_since);
 
-  dout(10) << __func__ << " missing before " << get_parent()->get_log().get_missing().get_items() << dendl;
+  dout(30) << __func__ << " missing before " << get_parent()->get_log().get_missing().get_items() << dendl;
   parent->maybe_preempt_replica_scrub(soid);
 
   int ackerosd = m->get_source().num();
@@ -1053,13 +1053,11 @@ void ReplicatedBackend::do_repop(OpRequestRef op)
 
   pg_missing_tracker_t pmissing = get_parent()->get_local_missing();
   if (pmissing.is_missing(soid)) {
-    dout(10) << __func__ << " j->second.is_missing(soid) " << pmissing.is_missing(soid) << dendl;
+    dout(30) << __func__ << " is_missing " << pmissing.is_missing(soid) << dendl;
     for (auto &&e: log) {
-      dout(10) << " add_next_event entry " << e << dendl;
+      dout(30) << " add_next_event entry " << e << dendl;
       get_parent()->add_local_next_event(e);
-      dout(10) << " entry version " << e.version << dendl;
-      dout(10) << " entry prior version " << e.prior_version << dendl;
-      dout(10) << " entry is_delete " << e.is_delete() << dendl;
+      dout(30) << " entry is_delete " << e.is_delete() << dendl;
     }
   }
 
@@ -1081,7 +1079,7 @@ void ReplicatedBackend::do_repop(OpRequestRef op)
   tls.push_back(std::move(rm->opt));
   parent->queue_transactions(tls, op);
   // op is cleaned up by oncommit/onapply when both are executed
-  dout(10) << __func__ << " missing after" << get_parent()->get_log().get_missing().get_items() << dendl;
+  dout(30) << __func__ << " missing after" << get_parent()->get_log().get_missing().get_items() << dendl;
 }
 
 void ReplicatedBackend::repop_commit(RepModifyRef rm)