From: Sage Weil <sage@redhat.com>
Date: Sat, 11 Aug 2018 18:55:30 +0000 (-0500)
Subject: osdc/Objecter: drop change_pool_auid
X-Git-Tag: v14.0.1~431^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=360c3b33f4e520c4c086e7e8fb3323c3d5ac2654;p=ceph.git

osdc/Objecter: drop change_pool_auid

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

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index 3a580852c8de..a264e723843f 100644
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -395,7 +395,7 @@ const char *ceph_pool_op_name(int op)
 	switch (op) {
 	case POOL_OP_CREATE: return "create";
 	case POOL_OP_DELETE: return "delete";
-	case POOL_OP_AUID_CHANGE: return "auid change";
+	case POOL_OP_AUID_CHANGE: return "auid change";  // (obsolete)
 	case POOL_OP_CREATE_SNAP: return "create snap";
 	case POOL_OP_DELETE_SNAP: return "delete snap";
 	case POOL_OP_CREATE_UNMANAGED_SNAP: return "create unmanaged snap";
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 7ded6d3a168b..b8b7008c58b4 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -183,7 +183,7 @@ struct ceph_mon_poolop {
 	struct ceph_fsid fsid;
 	__le32 pool;
 	__le32 op;
-	__le64 auid;
+	__le64 auid;  // obsolete
 	__le64 snapid;
 	__le32 name_len;
 } __attribute__ ((packed));
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 1a804de9c83a..8cde68a937fd 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -3989,32 +3989,6 @@ void Objecter::_do_delete_pool(int64_t pool, Context *onfinish)
   pool_op_submit(op);
 }
 
-/**
- * change the auid owner of a pool by contacting the monitor.
- * This requires the current connection to have write permissions
- * on both the pool's current auid and the new (parameter) auid.
- * Uses the standard Context callback when done.
- */
-int Objecter::change_pool_auid(int64_t pool, Context *onfinish, uint64_t auid)
-{
-  unique_lock wl(rwlock);
-  ldout(cct, 10) << "change_pool_auid " << pool << " to " << auid << dendl;
-  PoolOp *op = new PoolOp;
-  if (!op) return -ENOMEM;
-  op->tid = ++last_tid;
-  op->pool = pool;
-  op->name = "change_pool_auid";
-  op->onfinish = onfinish;
-  op->pool_op = POOL_OP_AUID_CHANGE;
-  op->auid = auid;
-  pool_ops[op->tid] = op;
-
-  logger->set(l_osdc_poolop_active, pool_ops.size());
-
-  pool_op_submit(op);
-  return 0;
-}
-
 void Objecter::pool_op_submit(PoolOp *op)
 {
   // rwlock is locked
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index a31ad28b1da1..7cd6d90a9d97 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -2938,7 +2938,6 @@ public:
 		  int crush_rule=-1);
   int delete_pool(int64_t pool, Context *onfinish);
   int delete_pool(const string& name, Context *onfinish);
-  int change_pool_auid(int64_t pool, Context *onfinish, uint64_t auid);
 
   void handle_pool_op_reply(MPoolOpReply *m);
   int pool_op_cancel(ceph_tid_t tid, int r);