mirror/ternfs-XTXMarkets
1
0
Fork 0
mirror of https://github.com/XTXMarkets/ternfs.git synced 2026-02-06 10:18:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add flags to block services in shards

Browse Source
This commit is contained in:
Francesco Mazzoli
2023-06-14 14:10:16 +00:00
parent b19f29635d
commit d4715ea11d
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/core/Bincode.hpp
View File

@@ -374,3 +374,11 @@ struct BincodeBuf {
};
constexpr size_t UDP_MTU = 1472;
constexpr uint8_t BLOCK_SERVICE_STALE = 1u;
constexpr uint8_t BLOCK_SERVICE_NO_READ = 1u<<1;
constexpr uint8_t BLOCK_SERVICE_NO_WRITE = 1u<<2;
constexpr uint8_t BLOCK_SERVICE_DECOMMISSIONED = 1u<<3;
constexpr uint8_t BLOCK_SERVICE_DONT_READ = BLOCK_SERVICE_STALE | BLOCK_SERVICE_NO_READ | BLOCK_SERVICE_DECOMMISSIONED;
constexpr uint8_t BLOCK_SERVICE_DONT_WRITE = BLOCK_SERVICE_STALE | BLOCK_SERVICE_NO_WRITE | BLOCK_SERVICE_DECOMMISSIONED;

9
cpp/shard/ShardDB.cpp
View File

@@ -213,6 +213,7 @@ struct BlockServiceCache {
uint16_t port1;
uint16_t port2;
uint8_t storageClass;
uint8_t flags;
};
struct ShardDBImpl {
@@ -425,6 +426,7 @@ struct ShardDBImpl {
cache.port2 = v().port2();
expandKey(v().secretKey(), cache.secretKey);
cache.storageClass = v().storageClass();
cache.flags = v().flags();
}
}
}
@@ -2491,8 +2493,11 @@ struct ShardDBImpl {
//
// It does require having at least 14 failure domains (to do RS(10,4)), and gives
// very little slack with the current situation of 17 failure domains.
// storage class -> failure domain -> block service ids
std::unordered_map<uint8_t, std::unordered_map<__int128, std::vector<uint64_t>>> blockServicesByFailureDomain;
for (const auto& [blockServiceId, blockService]: _blockServicesCache) {
if (blockService.flags & BLOCK_SERVICE_DONT_WRITE) { continue; }
__int128 failureDomain;
static_assert(sizeof(failureDomain) == sizeof(blockService.failureDomain));
memcpy(&failureDomain, &blockService.failureDomain[0], sizeof(failureDomain));
@@ -2522,7 +2527,7 @@ struct ShardDBImpl {
for (int i = 0; i < entry.blockServices.els.size(); i++) {
const auto& entryBlock = entry.blockServices.els[i];
blockKey().setBlockServiceId(entryBlock.id.u64);
blockBody().setVersion(0);
blockBody().setVersion(1);
blockBody().setId(entryBlock.id.u64);
blockBody().setIp1(entryBlock.ip1.data);
blockBody().setPort1(entryBlock.port1);
@@ -2531,6 +2536,7 @@ struct ShardDBImpl {
blockBody().setStorageClass(entryBlock.storageClass);
blockBody().setFailureDomain(entryBlock.failureDomain.data);
blockBody().setSecretKey(entryBlock.secretKey.data);
blockBody().setFlags(entryBlock.flags);
ROCKS_DB_CHECKED(batch.Put(_defaultCf, blockKey.toSlice(), blockBody.toSlice()));
auto& cache = _blockServicesCache[entryBlock.id.u64];
expandKey(entryBlock.secretKey.data, cache.secretKey);
@@ -2540,6 +2546,7 @@ struct ShardDBImpl {
cache.port2 = entryBlock.port2;
cache.storageClass = entryBlock.storageClass;
cache.failureDomain = entryBlock.failureDomain.data;
cache.flags = entryBlock.flags;
}
_updateCurrentBlockServices(time, batch);
}

27
cpp/shard/ShardDBData.hpp
View File

@@ -60,8 +60,33 @@ struct BlockServiceBody {
LE, uint8_t, storageClass, setStorageClass,
FBYTES, 16, failureDomain, setFailureDomain,
FBYTES, 16, secretKey, setSecretKey,
END_STATIC
EMIT_OFFSET, V0_OFFSET,
LE, uint8_t, flagsV1, setFlagsV1,
EMIT_OFFSET, V1_OFFSET,
END
)
static constexpr size_t MAX_SIZE = V1_OFFSET;
size_t size() const {
switch (version()) {
case 0: return V0_OFFSET;
case 1: return V1_OFFSET;
default: throw EGGS_EXCEPTION("bad version %s", version());
}
}
void checkSize(size_t s) { ALWAYS_ASSERT(s == size()); }
uint8_t flags() const {
if (unlikely(version() == 0)) { return 0; }
return flagsV1();
}
void setFlags(uint8_t f) {
ALWAYS_ASSERT(version() > 0);
setFlagsV1(f);
}
};
struct CurrentBlockServicesBody {