--- kernel-3.10.0-327.el7/linux-3.10.0-327.el7.centos.x86_64/include/linux/ceph/osdmap.h	2015-10-30 04:56:51.000000000 +0800
+++ kernel-3.10.0-327.el7-patch/linux-3.10.0-327.el7.centos.x86_64/include/linux/ceph/osdmap.h	2017-10-11 15:31:40.928820886 +0800
@@ -95,6 +95,7 @@ struct ceph_osdmap {
 	u32 max_osd;       /* size of osd_state, _offload, _addr arrays */
 	u8 *osd_state;     /* CEPH_OSD_* */
 	u32 *osd_weight;   /* 0 = failed, 0x10000 = 100% normal */
+	u32 *recovery_weight;   /* 0 = failed, 0x10000 = 100% normal */
 	struct ceph_entity_addr *osd_addr;
 
 	struct rb_root pg_temp;
--- kernel-3.10.0-327.el7/linux-3.10.0-327.el7.centos.x86_64/net/ceph/osdmap.c	2015-10-30 04:56:51.000000000 +0800
+++ kernel-3.10.0-327.el7-patch/linux-3.10.0-327.el7.centos.x86_64/net/ceph/osdmap.c	2017-10-11 15:31:12.296822923 +0800
@@ -678,6 +678,7 @@ void ceph_osdmap_destroy(struct ceph_osd
 	}
 	kfree(map->osd_state);
 	kfree(map->osd_weight);
+	kfree(map->recovery_weight);
 	kfree(map->osd_addr);
 	kfree(map->osd_primary_affinity);
 	kfree(map);
@@ -691,7 +692,7 @@ void ceph_osdmap_destroy(struct ceph_osd
 static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
 {
 	u8 *state;
-	u32 *weight;
+	u32 *weight, *rweight;
 	struct ceph_entity_addr *addr;
 	int i;
 
@@ -705,6 +706,11 @@ static int osdmap_set_max_osd(struct cep
 		return -ENOMEM;
 	map->osd_weight = weight;
 
+	rweight = krealloc(map->recovery_weight, max*sizeof(*rweight), GFP_NOFS);
+	if (!rweight)
+		return -ENOMEM;
+	map->recovery_weight = rweight;
+
 	addr = krealloc(map->osd_addr, max*sizeof(*addr), GFP_NOFS);
 	if (!addr)
 		return -ENOMEM;
@@ -713,6 +719,7 @@ static int osdmap_set_max_osd(struct cep
 	for (i = map->max_osd; i < max; i++) {
 		map->osd_state[i] = 0;
 		map->osd_weight[i] = CEPH_OSD_OUT;
+		map->recovery_weight[i] = CEPH_OSD_IN;
 		memset(map->osd_addr + i, 0, sizeof(*map->osd_addr));
 	}
 
@@ -735,7 +742,7 @@ static int osdmap_set_max_osd(struct cep
 	return 0;
 }
 
-#define OSDMAP_WRAPPER_COMPAT_VER	7
+#define OSDMAP_WRAPPER_COMPAT_VER	8
 #define OSDMAP_CLIENT_DATA_COMPAT_VER	1
 
 /*
      
      
      
@@ -1096,6 +1103,7 @@ static int osdmap_decode(void **p, void
 	/* osd_state, osd_weight, osd_addrs->client_addr */
                                                                                         
 	ceph_decode_need(p, end, 3*sizeof(u32) +
 			 map->max_osd*(1 + sizeof(*map->osd_weight) +
+				       sizeof(*map->recovery_weight) +
 				       sizeof(*map->osd_addr)), e_inval);
 
 	if (ceph_decode_32(p) != map->max_osd)
@@ -1112,6 +1120,12 @@ static int osdmap_decode(void **p, void
 	if (ceph_decode_32(p) != map->max_osd)
 		goto e_inval;
 
+	for (i = 0; i < map->max_osd; i++)
+		map->recovery_weight[i] = ceph_decode_32(p);
+
+	if (ceph_decode_32(p) != map->max_osd)
+		goto e_inval;
+
 	ceph_decode_copy(p, map->osd_addr, map->max_osd*sizeof(*map->osd_addr));
 	for (i = 0; i < map->max_osd; i++)
 		ceph_decode_addr(&map->osd_addr[i]);
@@ -1334,6 +1348,20 @@ struct ceph_osdmap *osdmap_apply_increme    ？？ 这个 7.6 和7.5 也没找到。。就没有修改
 			map->osd_weight[osd] = off;
 	}
 
                                                ？？？？？？缺少？？
                                                
+	/* new_recovery_weight */
+	ceph_decode_32_safe(p, end, len, e_inval);
+	while (len--) {
+		u32 osd, off;
+		ceph_decode_need(p, end, sizeof(u32)*2, e_inval);
+		osd = ceph_decode_32(p);
+		off = ceph_decode_32(p);
+		pr_info("osd%d recovery weight 0x%x %s\n", osd, off,
+		     off == CEPH_OSD_IN ? "(in)" :
+		     (off == CEPH_OSD_OUT ? "(out)" : ""));
+		if (osd < map->max_osd)
+			map->recovery_weight[osd] = off;
+	}
+
 	/* new_pg_temp */
 	err = decode_new_pg_temp(p, end, map);
 	if (err)
@@ -1530,11 +1558,16 @@ static int pg_to_raw_osds(struct ceph_os
  */
 static int raw_to_up_osds(struct ceph_osdmap *osdmap,
 			  struct ceph_pg_pool_info *pool,
+			  struct ceph_pg pgid,
 			  int *osds, int len, int *primary)
 {
 	int up_primary = -1;
 	int i;
 
+	/* raw_pg -> pg */
+	pgid.seed = ceph_stable_mod(pgid.seed, pool->pg_num,
+				    pool->pg_num_mask);
+
 	if (ceph_can_shift_osds(pool)) {
 		int removed = 0;
 
@@ -1543,6 +1576,12 @@ static int raw_to_up_osds(struct ceph_os
 				removed++;
 				continue;
 			}
+			if (pgid.seed > (pool->pg_num *
+					 osdmap->recovery_weight[osds[i]] /
+					 CEPH_OSD_IN)) {
+				removed++;
+				continue;
+			}
 			if (removed)
 				osds[i - removed] = osds[i];
 		}
                                                 
                                                 
                                                 
  下面这个没有了。另外，raw_to_up_osds的一个 调用 ，参数个数不对。。。
          
                                                 
                                                         raw_to_up_osds(osdmap, pi, &pgid, up);

                                                         raw_to_up_osds(osdmap, pi, &pgid, up);

                                                 
                                                 liang
@@ -1730,7 +1769,7 @@ int ceph_calc_pg_acting(struct ceph_osdm
 		return len;
 	}
 
-	len = raw_to_up_osds(osdmap, pool, osds, len, primary);
+	len = raw_to_up_osds(osdmap, pool, pgid, osds, len, primary);
 
 	apply_primary_affinity(osdmap, pps, pool, osds, len, primary);