osd,mon: stop setting pg_num_pending_dec_epoch

This doesn't have a user.  (It did once in the history leading up to the
pg merge, but the final version does not use this value.)

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 31a975fa3d2584c4b94592ffcb07c5d923916c83..1159365d3692a43f30df0e508d582927c69cf467 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6737,7 +6737,7 @@ int OSDMonitor::prepare_new_pool(string& name,
   pi->set_pg_num(
     max > 0 ? std::min<uint64_t>(pg_num, std::max<int64_t>(1, max))
     : pg_num);
-  pi->set_pg_num_pending(pi->get_pg_num(), pending_inc.epoch);
+  pi->set_pg_num_pending(pi->get_pg_num());
   pi->set_pg_num_target(pg_num);
   pi->set_pgp_num(pi->get_pg_num());
   pi->set_pgp_num_target(pgp_num);
@@ -6924,7 +6924,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
           << ") - 1; only single pg decrease is currently supported";
        return -EINVAL;
       }
-      p.set_pg_num_pending(n, pending_inc.epoch);
+      p.set_pg_num_pending(n);
       // force pre-nautilus clients to resend their ops, since they
       // don't understand pg_num_pending changes form a new interval
       p.last_force_op_resend_prenautilus = pending_inc.epoch;

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 7c28877d1c6d088aa22d3e6b0a18bf68e865a987..7ee2dd300a5480422873be95283895edbfef7c6c 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1603,9 +1603,6 @@ public:
   unsigned get_pg_num_target() const { return pg_num_target; }
   unsigned get_pgp_num_target() const { return pgp_num_target; }
   unsigned get_pg_num_pending() const { return pg_num_pending; }
-  epoch_t get_pg_num_pending_dec_epoch() const {
-    return pg_num_pending_dec_epoch;
-  }
 
   unsigned get_pg_num_mask() const { return pg_num_mask; }
   unsigned get_pgp_num_mask() const { return pgp_num_mask; }
@@ -1626,9 +1623,8 @@ public:
     pgp_num = p;
     calc_pg_masks();
   }
-  void set_pg_num_pending(int p, epoch_t e) {
+  void set_pg_num_pending(int p) {
     pg_num_pending = p;
-    pg_num_pending_dec_epoch = e;
     calc_pg_masks();
   }
   void set_pg_num_target(int p) {

diff --git a/src/test/osd/types.cc b/src/test/osd/types.cc
index 9dd9c5d58c4c9fb752eb72a83169e7a13b75aae0..b87638e0ba0d88eaee4e8e27161aeb318e72c290 100644 (file)
--- a/src/test/osd/types.cc
+++ b/src/test/osd/types.cc
@@ -149,7 +149,7 @@ for (unsigned i = 0; i < 4; ++i) {
     OSDMap::Incremental inc(epoch + 1);
     inc.new_pools[pool_id].min_size = min_size;
     inc.new_pools[pool_id].set_pg_num(pg_num);
-    inc.new_pools[pool_id].set_pg_num_pending(pg_num, 1);
+    inc.new_pools[pool_id].set_pg_num_pending(pg_num);
     inc.new_up_thru[osd_id] = epoch + 1;
     osdmap->apply_incremental(inc);
     lastmap->apply_incremental(inc);
@@ -324,7 +324,7 @@ for (unsigned i = 0; i < 4; ++i) {
     OSDMap::Incremental inc(epoch + 1);
     inc.new_pools[pool_id].min_size = min_size;
     inc.new_pools[pool_id].set_pg_num(pg_num);
-    inc.new_pools[pool_id].set_pg_num_pending(pg_num - 1, epoch + 1);
+    inc.new_pools[pool_id].set_pg_num_pending(pg_num - 1);
     osdmap->apply_incremental(inc);
     cout << "pg_num " << pg_num << std::endl;
     PastIntervals past_intervals;
@@ -390,7 +390,7 @@ for (unsigned i = 0; i < 4; ++i) {
     osdmap->set_epoch(epoch);
     OSDMap::Incremental inc(epoch + 1);
     inc.new_pools[pool_id].min_size = min_size;
-    inc.new_pools[pool_id].set_pg_num_pending(pg_num - 1, epoch + 1);
+    inc.new_pools[pool_id].set_pg_num_pending(pg_num - 1);
     osdmap->apply_incremental(inc);
 
     PastIntervals past_intervals;