RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

osdc/Objecter: drop change_pool_auid

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-08-11 13:55:30 -05:00
parent 1cbca88f83
commit 360c3b33f4
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ceph_strings.cc
View File

@ -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";

2
src/include/ceph_fs.h
View File

@ -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));

26
src/osdc/Objecter.cc
View File

@ -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

1
src/osdc/Objecter.h
View File

@ -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);