Merge tag 'ceph-for-5.8-rc2' of git://github.com/ceph/ceph-client (672f9255) · Commits · 戴 / test

drivers/block/rbd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1451,8 +1451,10 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req)
		static void rbd_osd_format_read(struct ceph_osd_request *osd_req)
		{
		struct rbd_obj_request *obj_request = osd_req->r_priv;
		struct rbd_device *rbd_dev = obj_request->img_request->rbd_dev;
		struct ceph_options *opt = rbd_dev->rbd_client->client->options;

		osd_req->r_flags = CEPH_OSD_FLAG_READ;
		osd_req->r_flags = CEPH_OSD_FLAG_READ \| opt->read_from_replica;
		osd_req->r_snapid = obj_request->img_request->snap_id;
		}

include/linux/ceph/libceph.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,7 @@ struct ceph_options {
		unsigned long osd_idle_ttl; /* jiffies */
		unsigned long osd_keepalive_timeout; /* jiffies */
		unsigned long osd_request_timeout; /* jiffies */

		u32 osd_req_flags; /* CEPH_OSD_FLAG_, applied to each OSD request /
		u32 read_from_replica; /* CEPH_OSD_FLAG_BALANCE/LOCALIZE_READS */

		/*
		* any type that can't be simply compared or doesn't need
		@@ -76,6 +75,7 @@ struct ceph_options {
		#define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000)
		#define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000)
		#define CEPH_OSD_REQUEST_TIMEOUT_DEFAULT 0 /* no timeout */
		#define CEPH_READ_FROM_REPLICA_DEFAULT 0 /* read from primary */

		#define CEPH_MONC_HUNT_INTERVAL msecs_to_jiffies(3 * 1000)
		#define CEPH_MONC_PING_INTERVAL msecs_to_jiffies(10 * 1000)

net/ceph/ceph_common.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -332,6 +332,7 @@ struct ceph_options *ceph_alloc_options(void)
		opt->mount_timeout = CEPH_MOUNT_TIMEOUT_DEFAULT;
		opt->osd_idle_ttl = CEPH_OSD_IDLE_TTL_DEFAULT;
		opt->osd_request_timeout = CEPH_OSD_REQUEST_TIMEOUT_DEFAULT;
		opt->read_from_replica = CEPH_READ_FROM_REPLICA_DEFAULT;
		return opt;
		}
		EXPORT_SYMBOL(ceph_alloc_options);
		@@ -490,16 +491,13 @@ int ceph_parse_param(struct fs_parameter param, struct ceph_options opt,
		case Opt_read_from_replica:
		switch (result.uint_32) {
		case Opt_read_from_replica_no:
		opt->osd_req_flags &= ~(CEPH_OSD_FLAG_BALANCE_READS \|
		CEPH_OSD_FLAG_LOCALIZE_READS);
		opt->read_from_replica = 0;
		break;
		case Opt_read_from_replica_balance:
		opt->osd_req_flags \|= CEPH_OSD_FLAG_BALANCE_READS;
		opt->osd_req_flags &= ~CEPH_OSD_FLAG_LOCALIZE_READS;
		opt->read_from_replica = CEPH_OSD_FLAG_BALANCE_READS;
		break;
		case Opt_read_from_replica_localize:
		opt->osd_req_flags \|= CEPH_OSD_FLAG_LOCALIZE_READS;
		opt->osd_req_flags &= ~CEPH_OSD_FLAG_BALANCE_READS;
		opt->read_from_replica = CEPH_OSD_FLAG_LOCALIZE_READS;
		break;
		default:
		BUG();
		@@ -613,9 +611,9 @@ int ceph_print_client_options(struct seq_file m, struct ceph_client client,
		}
		seq_putc(m, ',');
		}
		if (opt->osd_req_flags & CEPH_OSD_FLAG_BALANCE_READS) {
		if (opt->read_from_replica == CEPH_OSD_FLAG_BALANCE_READS) {
		seq_puts(m, "read_from_replica=balance,");
		} else if (opt->osd_req_flags & CEPH_OSD_FLAG_LOCALIZE_READS) {
		} else if (opt->read_from_replica == CEPH_OSD_FLAG_LOCALIZE_READS) {
		seq_puts(m, "read_from_replica=localize,");
		}

net/ceph/osd_client.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -445,8 +445,10 @@ static void target_copy(struct ceph_osd_request_target *dest,
		dest->size = src->size;
		dest->min_size = src->min_size;
		dest->sort_bitwise = src->sort_bitwise;
		dest->recovery_deletes = src->recovery_deletes;

		dest->flags = src->flags;
		dest->used_replica = src->used_replica;
		dest->paused = src->paused;

		dest->epoch = src->epoch;
		@@ -1117,10 +1119,10 @@ struct ceph_osd_request ceph_osdc_new_request(struct ceph_osd_client osdc,
		truncate_size, truncate_seq);
		}

		req->r_flags = flags;
		req->r_base_oloc.pool = layout->pool_id;
		req->r_base_oloc.pool_ns = ceph_try_get_string(layout->pool_ns);
		ceph_oid_printf(&req->r_base_oid, "%llx.%08llx", vino.ino, objnum);
		req->r_flags = flags \| osdc->client->options->read_from_replica;

		req->r_snapid = vino.snap;
		if (flags & CEPH_OSD_FLAG_WRITE)
		@@ -2431,14 +2433,11 @@ promote:

		static void account_request(struct ceph_osd_request *req)
		{
		struct ceph_osd_client *osdc = req->r_osdc;

		WARN_ON(req->r_flags & (CEPH_OSD_FLAG_ACK \| CEPH_OSD_FLAG_ONDISK));
		WARN_ON(!(req->r_flags & (CEPH_OSD_FLAG_READ \| CEPH_OSD_FLAG_WRITE)));

		req->r_flags \|= CEPH_OSD_FLAG_ONDISK;
		req->r_flags \|= osdc->client->options->osd_req_flags;
		atomic_inc(&osdc->num_requests);
		atomic_inc(&req->r_osdc->num_requests);

		req->r_start_stamp = jiffies;
		req->r_start_latency = ktime_get();

Admin message