osd: remove ticket from MOSDOp

diff --git a/src/include/rados.h b/src/include/rados.h
index d6067072797d80e82dd2264aa1bab223546a2864..a25c69dbcbf3e614eee8fa1cd4c06fef4885ddf9 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -399,7 +399,6 @@ struct ceph_osd_request_head {
        struct ceph_eversion reassert_version; /* if we are replaying op */
 
        __le32 object_len;
-       __le32 ticket_len;
 
        __le64 snapid;
        __le64 snap_seq;       /* writer's snap context */

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index a0d7dd30198fb1e7e958438b0c88468f15b78e90..12e0d8de46a0819b4f2f3eae14fad47d939b3a76 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -150,7 +150,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
        WARN_ON((flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)) == 0);
 
        /* create message; allow space for oid */
-       msg_size += 40 + osdc->client->signed_ticket_len;
+       msg_size += 40;
        if (snapc)
                msg_size += sizeof(u64) * snapc->num_snaps;
        msg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size, 0, 0, NULL);
@@ -183,16 +183,11 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
                op->payload_len = cpu_to_le32(*plen);
        }
 
-       /* fill in oid, ticket */
+       /* fill in oid */
        head->object_len = cpu_to_le32(req->r_oid_len);
        memcpy(p, req->r_oid, req->r_oid_len);
        p += req->r_oid_len;
 
-       head->ticket_len = cpu_to_le32(osdc->client->signed_ticket_len);
-       memcpy(p, osdc->client->signed_ticket,
-              osdc->client->signed_ticket_len);
-       p += osdc->client->signed_ticket_len;
-
        /* additional ops */
        if (do_trunc) {
                op++;

diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index 85ab41e320a3bbcf5738c68a43bab52d9892f7ec..835cd0968455d11698d52a6aa3b403725fc4bf7a 100644 (file)
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -35,7 +35,6 @@ private:
 public:
   object_t oid;
   vector<OSDOp> ops;
-  bufferlist ticket;
   vector<snapid_t> snaps;
   osd_peer_stat_t peer_stat;
   int rmw_flags;
@@ -78,19 +77,16 @@ public:
     return peer_stat; 
   }
 
-  bufferlist& get_ticket() { return ticket; }
-
   //void inc_shed_count() { head.shed_count = get_shed_count() + 1; }
   //int get_shed_count() { return head.shed_count; }
  
 
 
-  MOSDOp(const bufferlist& tkt, int inc, long tid,
+  MOSDOp(int inc, long tid,
          object_t& _oid, ceph_object_layout ol, epoch_t mapepoch,
         int flags) :
     Message(CEPH_MSG_OSD_OP),
     oid(_oid),
-    ticket(tkt),
     rmw_flags(flags) {
     memset(&head, 0, sizeof(head));
     head.tid = tid;
@@ -164,7 +160,6 @@ public:
     head.object_len = oid.name.length();
     head.num_snaps = snaps.size();
     head.num_ops = ops.size();
-    head.ticket_len = ticket.length();
     ::encode(head, payload);
 
     for (unsigned i = 0; i < head.num_ops; i++) {
@@ -174,7 +169,6 @@ public:
     }
 
     ::encode_nohead(oid.name, payload);
-    ::encode_nohead(ticket, payload);
     ::encode_nohead(snaps, payload);
     if (head.flags & CEPH_OSD_FLAG_PEERSTAT)
       ::encode(peer_stat, payload);
@@ -191,7 +185,6 @@ public:
       off += ops[i].op.payload_len;
     }
     decode_nohead(head.object_len, oid.name, p);
-    decode_nohead(head.ticket_len, ticket, p);
     decode_nohead(head.num_snaps, snaps, p);
     if (head.flags & CEPH_OSD_FLAG_PEERSTAT)
       ::decode(peer_stat, p);

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index da46ed3fcfc5898fb38d1ada6d22c167c737b007..22d617f017d04b953554edaeb722533c07d723e5 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -434,9 +434,7 @@ tid_t Objecter::op_submit(Op *op)
     if (op->onack)
       flags |= CEPH_OSD_FLAG_ACK;
 
-    bufferlist empty_ticket_fixme;
-#warning remove signed ticket ref
-    MOSDOp *m = new MOSDOp(empty_ticket_fixme, client_inc, op->tid,
+    MOSDOp *m = new MOSDOp(client_inc, op->tid,
                           op->oid, op->layout, osdmap->get_epoch(),
                           flags);