This covers only the simplest case - an object size sized write, but it's still useful in tiering setups when EC is used for the base tier as writefull op can be proxied, saving an object promotion. Even though updating ceph_osdc_new_request() to allow writefull should just be a matter of fixing an assert, I didn't do it because its only user is cephfs. All other sites were updated. Reflects ceph.git commit 7bfb7f9025a8ee0d2305f49bf0336d2424da5b5b.
Unified · Split
| @@ -1863,9 +1863,11 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req, · 1862 unmodified lines | ||
| 1863 | 1863 | rbd_osd_read_callback(obj_request); |
| 1864 | 1864 | break; |
| 1865 | 1865 | case CEPH_OSD_OP_SETALLOCHINT: |
| 1866 | − rbd_assert(osd_req->r_ops[1].op == CEPH_OSD_OP_WRITE); | |
| 1866 | + rbd_assert(osd_req->r_ops[1].op == CEPH_OSD_OP_WRITE || | |
| 1867 | + osd_req->r_ops[1].op == CEPH_OSD_OP_WRITEFULL); | |
| 1867 | 1868 | /* fall through */ |
| 1868 | 1869 | case CEPH_OSD_OP_WRITE: |
| 1870 | + case CEPH_OSD_OP_WRITEFULL: | |
| 1869 | 1871 | rbd_osd_write_callback(obj_request); |
| 1870 | 1872 | break; |
| 1871 | 1873 | case CEPH_OSD_OP_STAT: |
| @@ -2401,7 +2403,10 @@ static void rbd_img_obj_request_fill(struct rbd_obj_request *obj_request, · 529 unmodified lines | ||
| 2401 | 2403 | opcode = CEPH_OSD_OP_ZERO; |
| 2402 | 2404 | } |
| 2403 | 2405 | } else if (op_type == OBJ_OP_WRITE) { |
| 2404 | − opcode = CEPH_OSD_OP_WRITE; | |
| 2406 | + if (!offset && length == object_size) | |
| 2407 | + opcode = CEPH_OSD_OP_WRITEFULL; | |
| 2408 | + else | |
| 2409 | + opcode = CEPH_OSD_OP_WRITE; | |
| 2405 | 2410 | osd_req_op_alloc_hint_init(osd_request, num_ops, |
| 2406 | 2411 | object_size, object_size); |
| 2407 | 2412 | num_ops++; |
| @@ -285,6 +285,7 @@ static void osd_req_op_data_release(struct ceph_osd_request *osd_req, · 284 unmodified lines | ||
| 285 | 285 | switch (op->op) { |
| 286 | 286 | case CEPH_OSD_OP_READ: |
| 287 | 287 | case CEPH_OSD_OP_WRITE: |
| 288 | + case CEPH_OSD_OP_WRITEFULL: | |
| 288 | 289 | ceph_osd_data_release(&op->extent.osd_data); |
| 289 | 290 | break; |
| 290 | 291 | case CEPH_OSD_OP_CALL: |
| @@ -485,13 +486,14 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req, · 194 unmodified lines | ||
| 485 | 486 | size_t payload_len = 0; |
| 486 | 487 | |
| 487 | 488 | BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE && |
| 488 | − opcode != CEPH_OSD_OP_ZERO && opcode != CEPH_OSD_OP_TRUNCATE); | |
| 489 | + opcode != CEPH_OSD_OP_WRITEFULL && opcode != CEPH_OSD_OP_ZERO && | |
| 490 | + opcode != CEPH_OSD_OP_TRUNCATE); | |
| 489 | 491 | |
| 490 | 492 | op->extent.offset = offset; |
| 491 | 493 | op->extent.length = length; |
| 492 | 494 | op->extent.truncate_size = truncate_size; |
| 493 | 495 | op->extent.truncate_seq = truncate_seq; |
| 494 | − if (opcode == CEPH_OSD_OP_WRITE) | |
| 496 | + if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL) | |
| 495 | 497 | payload_len += length; |
| 496 | 498 | |
| 497 | 499 | op->payload_len = payload_len; |
| @@ -670,9 +672,11 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, · 172 unmodified lines | ||
| 670 | 672 | break; |
| 671 | 673 | case CEPH_OSD_OP_READ: |
| 672 | 674 | case CEPH_OSD_OP_WRITE: |
| 675 | + case CEPH_OSD_OP_WRITEFULL: | |
| 673 | 676 | case CEPH_OSD_OP_ZERO: |
| 674 | 677 | case CEPH_OSD_OP_TRUNCATE: |
| 675 | − if (src->op == CEPH_OSD_OP_WRITE) | |
| 678 | + if (src->op == CEPH_OSD_OP_WRITE || | |
| 679 | + src->op == CEPH_OSD_OP_WRITEFULL) | |
| 676 | 680 | request_data_len = src->extent.length; |
| 677 | 681 | dst->extent.offset = cpu_to_le64(src->extent.offset); |
| 678 | 682 | dst->extent.length = cpu_to_le64(src->extent.length); |
| @@ -681,7 +685,8 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, · 2 unmodified lines | ||
| 681 | 685 | dst->extent.truncate_seq = |
| 682 | 686 | cpu_to_le32(src->extent.truncate_seq); |
| 683 | 687 | osd_data = &src->extent.osd_data; |
| 684 | − if (src->op == CEPH_OSD_OP_WRITE) | |
| 688 | + if (src->op == CEPH_OSD_OP_WRITE || | |
| 689 | + src->op == CEPH_OSD_OP_WRITEFULL) | |
| 685 | 690 | ceph_osdc_msg_data_add(req->r_request, osd_data); |
| 686 | 691 | else |
| 687 | 692 | ceph_osdc_msg_data_add(req->r_reply, osd_data); |