objecter: rename POOL_DISAPPEARED to POOL_DNE

The pool may never have existed.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index c558ea112b5ae01afde1f09ddc7aeb3b9c2e759e..e90c3989953f1af65e99ba5a94b81e742ddf9ff2 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -77,7 +77,7 @@ void Objecter::send_linger(LingerOp *info)
 
     if (info->session) {
       int r = recalc_op_target(o);
-      if (r == RECALC_OP_TARGET_POOL_DISAPPEARED) {
+      if (r == RECALC_OP_TARGET_POOL_DNE) {
        linger_check_for_latest_map(info);
       }
     }
@@ -241,7 +241,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
            need_resend_linger.push_back(op);
            linger_cancel_map_check(op);
            break;
-         case RECALC_OP_TARGET_POOL_DISAPPEARED:
+         case RECALC_OP_TARGET_POOL_DNE:
            linger_check_for_latest_map(op);
            break;
          }
@@ -261,7 +261,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
            need_resend[op->tid] = op;
            op_cancel_map_check(op);
            break;
-         case RECALC_OP_TARGET_POOL_DISAPPEARED:
+         case RECALC_OP_TARGET_POOL_DNE:
            op_check_for_latest_map(op);
            break;
          }
@@ -586,7 +586,7 @@ tid_t Objecter::op_submit(Op *op, OSDSession *s)
     s->ops.push_back(&op->session_item);
   } else {
     int r = recalc_op_target(op);
-    check_for_latest_map = (r == RECALC_OP_TARGET_POOL_DISAPPEARED);
+    check_for_latest_map = (r == RECALC_OP_TARGET_POOL_DNE);
     num_homeless_ops++;  // initially!
   }
 
@@ -665,7 +665,7 @@ int Objecter::recalc_op_target(Op *op)
   if (op->oid.name.length()) {
     int ret = osdmap->object_locator_to_pg(op->oid, op->oloc, pgid);
     if (ret == -ENOENT)
-      return RECALC_OP_TARGET_POOL_DISAPPEARED;
+      return RECALC_OP_TARGET_POOL_DNE;
   }
   osdmap->pg_to_acting_osds(pgid, acting);
 
@@ -722,7 +722,7 @@ bool Objecter::recalc_linger_op_target(LingerOp *linger_op)
   pg_t pgid;
   int ret = osdmap->object_locator_to_pg(linger_op->oid, linger_op->oloc, pgid);
   if (ret == -ENOENT) {
-    return RECALC_OP_TARGET_POOL_DISAPPEARED;
+    return RECALC_OP_TARGET_POOL_DNE;
   }
   osdmap->pg_to_acting_osds(pgid, acting);
 

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index d9b33a293e5e7322ff1144b16462540911e6cd84..c71685130603a24bbee9f63da4934d350b6b3105 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -561,7 +561,7 @@ public:
   enum recalc_op_target_result {
     RECALC_OP_TARGET_NO_ACTION = 0,
     RECALC_OP_TARGET_NEED_RESEND,
-    RECALC_OP_TARGET_POOL_DISAPPEARED,
+    RECALC_OP_TARGET_POOL_DNE,
   };
   int recalc_op_target(Op *op);
   bool recalc_linger_op_target(LingerOp *op);