Add pool support to OSD, part 1

This just fixes all the code so it builds and works like before, but doesn't yet bring the support for replicated pools.
2020-09-04 17:04:17 +03:00
parent 4cdad634b5
commit 168cc2c803
12 changed files with 247 additions and 204 deletions
@@ -13,12 +13,6 @@
 #define ETCD_SLOW_TIMEOUT 5000
 #define ETCD_QUICK_TIMEOUT 1000

-#define POOL_SCHEME_REPLICATED 1
-#define POOL_SCHEME_XOR 2
-#define POOL_ID_MAX 0x10000
-#define POOL_ID_BITS 16
-#define INODE_POOL(inode) ((inode) >> (64 - POOL_ID_BITS))
-
 struct json_kv_t
 {
    std::string key;
@@ -38,8 +32,6 @@ struct pg_config_t
    uint64_t epoch;
 };

-typedef uint64_t pool_id_t;
-
 struct pool_config_t
 {
    bool exists;