mirror of
https://github.com/facebook/sapling.git
synced 2024-10-05 06:18:07 +03:00
capabilites -> capabilities
Summary: Fix a typo. The word capabilities hurts my eyes when I look at it too long, but it's the correct spelling, so sed it into place. Reviewed By: kmancini Differential Revision: D44945525 fbshipit-source-id: 05e82c058c3015b0590b07d6458840b4c56730b6
This commit is contained in:
Chad Austin
Facebook GitHub Bot
parent
1c3e009c34
commit
18e8b4fe77
@ -122,7 +122,7 @@ uint64_t TakeoverData::computeCompatibleCapabilities(
|
||||
return compatible;
|
||||
}
|
||||
|
||||
uint64_t TakeoverData::versionToCapabilites(int32_t version) {
|
||||
uint64_t TakeoverData::versionToCapabilities(int32_t version) {
|
||||
switch (version) {
|
||||
case kTakeoverProtocolVersionNeverSupported:
|
||||
return 0;
|
||||
@ -163,7 +163,7 @@ uint64_t TakeoverData::versionToCapabilites(int32_t version) {
|
||||
throwf<std::runtime_error>("Unsupported version: {}", version);
|
||||
}
|
||||
|
||||
int32_t TakeoverData::capabilitesToVersion(uint64_t capabilities) {
|
||||
int32_t TakeoverData::capabilitiesToVersion(uint64_t capabilities) {
|
||||
if (capabilities == 0) {
|
||||
return kTakeoverProtocolVersionNeverSupported;
|
||||
}
|
||||
@ -418,12 +418,12 @@ uint64_t TakeoverData::getProtocolCapabilities(IOBuf* buf) {
|
||||
case kTakeoverProtocolVersionFive:
|
||||
case kTakeoverProtocolVersionSix:
|
||||
buf->trimStart(sizeof(uint32_t));
|
||||
return versionToCapabilites(version);
|
||||
return versionToCapabilities(version);
|
||||
case kTakeoverProtocolVersionSeven: {
|
||||
// version 7 and above should support INCLUDE_HEADER_SIZE and
|
||||
// CAPABILITY_MATCHING but we check those assumptions to make this more
|
||||
// clear.
|
||||
auto versionBasedCapabilities = versionToCapabilites(version);
|
||||
auto versionBasedCapabilities = versionToCapabilities(version);
|
||||
auto expected_capabilities = TakeoverCapabilities::INCLUDE_HEADER_SIZE |
|
||||
TakeoverCapabilities::CAPABILITY_MATCHING;
|
||||
if ((versionBasedCapabilities & expected_capabilities) !=
|
||||
@ -509,7 +509,7 @@ void TakeoverData::serializeHeader(
|
||||
uint64_t protocolCapabilities,
|
||||
folly::IOBufQueue& buf) {
|
||||
folly::io::QueueAppender appender(&buf, 0);
|
||||
int32_t versionToAdvertize = capabilitesToVersion(protocolCapabilities);
|
||||
int32_t versionToAdvertize = capabilitiesToVersion(protocolCapabilities);
|
||||
// first word is the protocol version. previous versions of EdenFS do not
|
||||
// know how to deserialize version 4 because they assume that protocol 4
|
||||
// uses protocol 3 serialization. We need to do this funkiness for rollback
|
||||
|
||||
@ -181,7 +181,7 @@ class TakeoverData {
|
||||
* protocol we use now and the capability based protocol we would like to use
|
||||
* in future versions. See T104382350.
|
||||
*/
|
||||
static uint64_t versionToCapabilites(int32_t version);
|
||||
static uint64_t versionToCapabilities(int32_t version);
|
||||
|
||||
/**
|
||||
* Converts a valid set of capabilities into the takeover version that
|
||||
@ -190,7 +190,7 @@ class TakeoverData {
|
||||
* capability based. So we "serialize" the capabilities as a version number.
|
||||
* Eventually we will migrate off versions, then we can get rid of this.
|
||||
*/
|
||||
static int32_t capabilitesToVersion(uint64_t capabilities);
|
||||
static int32_t capabilitiesToVersion(uint64_t capabilities);
|
||||
|
||||
/**
|
||||
* Given a set of versions provided by a client, find the largest
|
||||
|
||||
@ -166,7 +166,7 @@ Future<Unit> TakeoverServer::ConnHandler::start() noexcept {
|
||||
// Initiate the takeover shutdown.
|
||||
state.protocolVersion = supported.value();
|
||||
auto protocolCapabilities =
|
||||
TakeoverData::versionToCapabilites(state.protocolVersion);
|
||||
TakeoverData::versionToCapabilities(state.protocolVersion);
|
||||
if (protocolCapabilities & TakeoverCapabilities::CAPABILITY_MATCHING) {
|
||||
state.protocolCapabilities =
|
||||
TakeoverData::computeCompatibleCapabilities(
|
||||
|
||||
@ -177,39 +177,39 @@ void checkExpectedFile(int fd, AbsolutePathPiece path) {
|
||||
TEST(Takeover, roundTripVersionCapabilities) {
|
||||
for (auto& version : kSupportedTakeoverVersions) {
|
||||
EXPECT_EQ(
|
||||
TakeoverData::capabilitesToVersion(
|
||||
TakeoverData::versionToCapabilites(version)),
|
||||
TakeoverData::capabilitiesToVersion(
|
||||
TakeoverData::versionToCapabilities(version)),
|
||||
version);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(Takeover, unsupportedVersionCapabilites) {
|
||||
TEST(Takeover, unsupportedVersionCapabilities) {
|
||||
EXPECT_EQ(
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionNeverSupported),
|
||||
0);
|
||||
|
||||
EXPECT_EQ(
|
||||
TakeoverData::capabilitesToVersion(0),
|
||||
TakeoverData::capabilitiesToVersion(0),
|
||||
TakeoverData::kTakeoverProtocolVersionNeverSupported);
|
||||
}
|
||||
|
||||
TEST(Takeover, invalidComboCapabilites) {
|
||||
TEST(Takeover, invalidComboCapabilities) {
|
||||
EXPECT_THROW(
|
||||
TakeoverData::capabilitesToVersion(TakeoverCapabilities::FUSE),
|
||||
TakeoverData::capabilitiesToVersion(TakeoverCapabilities::FUSE),
|
||||
std::runtime_error);
|
||||
}
|
||||
|
||||
TEST(Takeover, matchCapabilites) {
|
||||
auto threeCapabilities = TakeoverData::versionToCapabilites(
|
||||
TEST(Takeover, matchCapabilities) {
|
||||
auto threeCapabilities = TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionThree);
|
||||
auto fourCapabilities = TakeoverData::versionToCapabilites(
|
||||
auto fourCapabilities = TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFour);
|
||||
auto fiveCapabilities = TakeoverData::versionToCapabilites(
|
||||
auto fiveCapabilities = TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFive);
|
||||
auto sixCapabilities = TakeoverData::versionToCapabilites(
|
||||
auto sixCapabilities = TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSix);
|
||||
auto sevenCapabilities = TakeoverData::versionToCapabilites(
|
||||
auto sevenCapabilities = TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven);
|
||||
|
||||
EXPECT_EQ(
|
||||
@ -245,7 +245,7 @@ void simpleTestImpl(
|
||||
const std::set<int32_t>& serverSupportedVersions =
|
||||
kSupportedTakeoverVersions,
|
||||
uint64_t clientCapabilities = kSupportedCapabilities,
|
||||
uint64_t serverCapabilites = kSupportedCapabilities) {
|
||||
uint64_t serverCapabilities = kSupportedCapabilities) {
|
||||
TemporaryDirectory tmpDir("eden_takeover_test");
|
||||
AbsolutePath tmpDirPath = canonicalPath(tmpDir.path().string());
|
||||
|
||||
@ -294,7 +294,7 @@ void simpleTestImpl(
|
||||
clientSupportedVersions,
|
||||
serverSupportedVersions,
|
||||
clientCapabilities,
|
||||
serverCapabilites);
|
||||
serverCapabilities);
|
||||
ASSERT_TRUE(serverSendFuture.hasValue());
|
||||
EXPECT_TRUE(result.hasValue());
|
||||
const auto& clientData = result.value();
|
||||
@ -337,9 +337,9 @@ TEST(Takeover, fourToSeven) {
|
||||
TakeoverData::kTakeoverProtocolVersionFive,
|
||||
TakeoverData::kTakeoverProtocolVersionSix,
|
||||
TakeoverData::kTakeoverProtocolVersionSeven},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFour),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven));
|
||||
|
||||
simpleTestImpl(
|
||||
@ -349,9 +349,9 @@ TEST(Takeover, fourToSeven) {
|
||||
TakeoverData::kTakeoverProtocolVersionSix,
|
||||
TakeoverData::kTakeoverProtocolVersionSeven},
|
||||
{TakeoverData::kTakeoverProtocolVersionFour},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFour));
|
||||
}
|
||||
|
||||
@ -364,9 +364,9 @@ TEST(Takeover, fiveToSeven) {
|
||||
TakeoverData::kTakeoverProtocolVersionFive,
|
||||
TakeoverData::kTakeoverProtocolVersionSix,
|
||||
TakeoverData::kTakeoverProtocolVersionSeven},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFive),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven));
|
||||
|
||||
simpleTestImpl(
|
||||
@ -377,9 +377,9 @@ TEST(Takeover, fiveToSeven) {
|
||||
TakeoverData::kTakeoverProtocolVersionSeven},
|
||||
{TakeoverData::kTakeoverProtocolVersionFour,
|
||||
TakeoverData::kTakeoverProtocolVersionFive},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFive));
|
||||
}
|
||||
|
||||
@ -393,9 +393,9 @@ TEST(Takeover, sixToSeven) {
|
||||
TakeoverData::kTakeoverProtocolVersionFive,
|
||||
TakeoverData::kTakeoverProtocolVersionSix,
|
||||
TakeoverData::kTakeoverProtocolVersionSeven},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSix),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven));
|
||||
|
||||
simpleTestImpl(
|
||||
@ -407,9 +407,9 @@ TEST(Takeover, sixToSeven) {
|
||||
{TakeoverData::kTakeoverProtocolVersionFour,
|
||||
TakeoverData::kTakeoverProtocolVersionFive,
|
||||
TakeoverData::kTakeoverProtocolVersionSix},
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSix));
|
||||
}
|
||||
|
||||
@ -418,36 +418,36 @@ TEST(Takeover, atypicalVersionCapability) {
|
||||
CheckMountdSocket::YES,
|
||||
kSupportedTakeoverVersions,
|
||||
kSupportedTakeoverVersions,
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSix),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven));
|
||||
|
||||
simpleTestImpl(
|
||||
CheckMountdSocket::YES,
|
||||
kSupportedTakeoverVersions,
|
||||
kSupportedTakeoverVersions,
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSix));
|
||||
|
||||
simpleTestImpl(
|
||||
CheckMountdSocket::YES,
|
||||
kSupportedTakeoverVersions,
|
||||
kSupportedTakeoverVersions,
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFive),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven));
|
||||
|
||||
simpleTestImpl(
|
||||
CheckMountdSocket::YES,
|
||||
kSupportedTakeoverVersions,
|
||||
kSupportedTakeoverVersions,
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionSeven),
|
||||
TakeoverData::versionToCapabilites(
|
||||
TakeoverData::versionToCapabilities(
|
||||
TakeoverData::kTakeoverProtocolVersionFive));
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user