libceph: add support for primary_temp mappings

[firefly-linux-kernel-4.4.55.git] / net / ceph / osdmap.c

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index f1cad21d1533bf9d63a66a3995b11d3b381b5fd7..20a38a37794cedd554c23f70ca97e02748e3d4a1 100644 (file)
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1597,7 +1597,7 @@ static int raw_to_up_osds(struct ceph_osdmap *osdmap,
 }
 
 /*
- * Given up set, apply pg_temp mapping.
+ * Given up set, apply pg_temp and primary_temp mappings.
  *
  * Return acting set length.  *primary is set to acting primary osd id,
  * or -1 if acting set is empty.
@@ -1644,6 +1644,11 @@ static int apply_temps(struct ceph_osdmap *osdmap,
                temp_primary = *primary;
        }
 
+       /* primary_temp? */
+       pg = __lookup_pg_mapping(&osdmap->primary_temp, pgid);
+       if (pg)
+               temp_primary = pg->primary_temp.osd;
+
        *primary = temp_primary;
        return temp_len;
 }
@@ -1651,19 +1656,21 @@ static int apply_temps(struct ceph_osdmap *osdmap,
 /*
  * Calculate acting set for given pgid.
  *
- * Return acting set length, or error.
+ * Return acting set length, or error.  *primary is set to acting
+ * primary osd id, or -1 if acting set is empty or on error.
  */
 int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
-                       int *osds)
+                       int *osds, int *primary)
 {
        struct ceph_pg_pool_info *pool;
        u32 pps;
        int len;
-       int primary;
 
        pool = __lookup_pg_pool(&osdmap->pg_pools, pgid.pool);
-       if (!pool)
-               return 0;
+       if (!pool) {
+               *primary = -1;
+               return -ENOENT;
+       }
 
        if (pool->flags & CEPH_POOL_FLAG_HASHPSPOOL) {
                /* hash pool id and seed so that pool PGs do not overlap */
@@ -1684,12 +1691,14 @@ int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
        }
 
        len = pg_to_raw_osds(osdmap, pool, pgid, pps, osds);
-       if (len < 0)
+       if (len < 0) {
+               *primary = -1;
                return len;
+       }
 
-       len = raw_to_up_osds(osdmap, pool, osds, len, &primary);
+       len = raw_to_up_osds(osdmap, pool, osds, len, primary);
 
-       len = apply_temps(osdmap, pool, pgid, osds, len, &primary);
+       len = apply_temps(osdmap, pool, pgid, osds, len, primary);
 
        return len;
 }