]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: remove auid session member
authorSage Weil <sage@redhat.com>
Sun, 12 Aug 2018 20:04:00 +0000 (15:04 -0500)
committerSage Weil <sage@redhat.com>
Fri, 31 Aug 2018 20:54:58 +0000 (15:54 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc
src/osd/PG.cc
src/osd/Session.h

index 1e08ad43eecd5b34aa496d24d6a6075852990a5c..e3925c0b2b9b3a78da9b010af0197b6be8b625a9 100644 (file)
@@ -6627,7 +6627,6 @@ bool OSD::ms_verify_authorizer(
   AuthCapsInfo caps_info;
   EntityName name;
   uint64_t global_id;
-  uint64_t auid = CEPH_AUTH_UID_DEFAULT;
 
   auto keys = monc->rotating_secrets.get();
   if (keys) {
@@ -6653,7 +6652,6 @@ bool OSD::ms_verify_authorizer(
     s->entity_name = name;
     if (caps_info.allow_all)
       s->caps.set_allow_all();
-    s->auid = auid;
 
     if (caps_info.caps.length() > 0) {
       auto p = caps_info.caps.cbegin();
index e960a60ce3ba5a9e5d02ccff0ae2b34537860aca..c34dc718cdee4575965c3f0383b8823147443990 100644 (file)
@@ -2142,7 +2142,7 @@ bool PG::op_has_sufficient_caps(OpRequestRef& op)
            << "session=" << session
            << " pool=" << pool.id << " (" << pool.name
            << " " << req->get_hobj().nspace
-          << ") owner=" << pool.info.auid
+          << ")"
           << " pool_app_metadata=" << pool.info.application_metadata
           << " need_read_cap=" << op->need_read_cap()
           << " need_write_cap=" << op->need_write_cap()
index 8b0e897f31a21752e9052dd2521fc3f35f3a2d1e..127e287c84544942537d3f987ad690b04e179743 100644 (file)
@@ -130,7 +130,6 @@ struct Backoff : public RefCountedObject {
 struct Session : public RefCountedObject {
   EntityName entity_name;
   OSDCap caps;
-  int64_t auid;
   ConnectionRef con;
   entity_addr_t socket_addr;
   WatchConState wstate;
@@ -152,7 +151,7 @@ struct Session : public RefCountedObject {
 
   explicit Session(CephContext *cct, Connection *con_) :
     RefCountedObject(cct),
-    auid(-1), con(con_),
+    con(con_),
     socket_addr(con_->get_peer_socket_addr()),
     wstate(cct),
     session_dispatch_lock("Session::session_dispatch_lock"),