History

rbd: use writefull op for object size writes

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.

Ilya Dryomov committed 11 years ago

Commit e30b7571 parent 0d9fde42 files · +16 −6Browse files

Unified · Split

2 files
  1. drivers/block/rbd.c +7 −2
  2. net/ceph/osd_client.c +9 −4
drivers/block/rbd.c+7−2
@@ -1863,9 +1863,11 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req, · 1862 unmodified lines
1863 rbd_osd_read_callback(obj_request);1863 rbd_osd_read_callback(obj_request);
1864 break;1864 break;
1865 case CEPH_OSD_OP_SETALLOCHINT: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 /* fall through */1868 /* fall through */
1868 case CEPH_OSD_OP_WRITE:1869 case CEPH_OSD_OP_WRITE:
1870 case CEPH_OSD_OP_WRITEFULL:
1869 rbd_osd_write_callback(obj_request);1871 rbd_osd_write_callback(obj_request);
1870 break;1872 break;
1871 case CEPH_OSD_OP_STAT: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 opcode = CEPH_OSD_OP_ZERO;2403 opcode = CEPH_OSD_OP_ZERO;
2402 }2404 }
2403 } else if (op_type == OBJ_OP_WRITE) {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 osd_req_op_alloc_hint_init(osd_request, num_ops,2410 osd_req_op_alloc_hint_init(osd_request, num_ops,
2406 object_size, object_size);2411 object_size, object_size);
2407 num_ops++;2412 num_ops++;
net/ceph/osd_client.c+9−4
@@ -285,6 +285,7 @@ static void osd_req_op_data_release(struct ceph_osd_request *osd_req, · 284 unmodified lines
285 switch (op->op) {285 switch (op->op) {
286 case CEPH_OSD_OP_READ:286 case CEPH_OSD_OP_READ:
287 case CEPH_OSD_OP_WRITE:287 case CEPH_OSD_OP_WRITE:
288 case CEPH_OSD_OP_WRITEFULL:
288 ceph_osd_data_release(&op->extent.osd_data);289 ceph_osd_data_release(&op->extent.osd_data);
289 break;290 break;
290 case CEPH_OSD_OP_CALL: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 size_t payload_len = 0;486 size_t payload_len = 0;
486 487
487 BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE &&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 op->extent.offset = offset;492 op->extent.offset = offset;
491 op->extent.length = length;493 op->extent.length = length;
492 op->extent.truncate_size = truncate_size;494 op->extent.truncate_size = truncate_size;
493 op->extent.truncate_seq = truncate_seq;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 payload_len += length;497 payload_len += length;
496 498
497 op->payload_len = payload_len;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 break;672 break;
671 case CEPH_OSD_OP_READ:673 case CEPH_OSD_OP_READ:
672 case CEPH_OSD_OP_WRITE:674 case CEPH_OSD_OP_WRITE:
675 case CEPH_OSD_OP_WRITEFULL:
673 case CEPH_OSD_OP_ZERO:676 case CEPH_OSD_OP_ZERO:
674 case CEPH_OSD_OP_TRUNCATE: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 request_data_len = src->extent.length;680 request_data_len = src->extent.length;
677 dst->extent.offset = cpu_to_le64(src->extent.offset);681 dst->extent.offset = cpu_to_le64(src->extent.offset);
678 dst->extent.length = cpu_to_le64(src->extent.length);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 dst->extent.truncate_seq =685 dst->extent.truncate_seq =
682 cpu_to_le32(src->extent.truncate_seq);686 cpu_to_le32(src->extent.truncate_seq);
683 osd_data = &src->extent.osd_data;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 ceph_osdc_msg_data_add(req->r_request, osd_data);690 ceph_osdc_msg_data_add(req->r_request, osd_data);
686 else691 else
687 ceph_osdc_msg_data_add(req->r_reply, osd_data);692 ceph_osdc_msg_data_add(req->r_reply, osd_data);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t