config: add a new knob

Reviewed By: chadaustin

Differential Revision: D31163226

fbshipit-source-id: 96dcba2bd62a0ce879a92a94050873c5725adce4
This commit is contained in:
Zeyi (Rice) Fan 2021-10-05 15:51:29 -07:00 committed by Facebook GitHub Bot
parent 23c7254e93
commit 3785bf7ff2
5 changed files with 30 additions and 6 deletions

View File

@ -17,6 +17,7 @@
#include <folly/portability/SysTypes.h>
#include <folly/portability/Unistd.h>
#include "common/rust/shed/hostcaps/hostcaps.h"
#include "eden/fs/config/ConfigSetting.h"
#include "eden/fs/config/FileChangeMonitor.h"
#include "eden/fs/config/MountProtocol.h"
@ -762,6 +763,24 @@ class EdenConfig : private ConfigSettingManager {
"clone:default-mount-protocol",
folly::kIsWindows ? MountProtocol::PRJFS : MountProtocol::FUSE,
this};
// [facebook]
// Facebook internal
/**
* (Facebook Internal) Determines if EdenFS should use ServiceRouter.
*/
#ifdef EDEN_HAVE_SERVICEROUTER
ConfigSetting<bool> enableServiceRouter{
"facebook:enable-service-router",
fb_has_servicerouter(),
this};
#else
ConfigSetting<bool> enableServiceRouter{
"facebook:enable-service-router",
false,
this};
#endif
};
} // namespace facebook::eden

View File

@ -7,7 +7,6 @@
#pragma once
#include <cpptoml.h>
#include <chrono>
#include <map>
#include <optional>
@ -15,6 +14,7 @@
#include <string>
#include <type_traits>
#include <cpptoml.h>
#include <re2/re2.h>
#include <folly/Expected.h>

View File

@ -141,7 +141,8 @@ void DefaultEdenMain::prepare(const EdenServer& /*server*/) {
fb303::registerFollyLoggingOptionHandlers();
}
MetadataImporterFactory DefaultEdenMain::getMetadataImporterFactory() {
MetadataImporterFactory DefaultEdenMain::getMetadataImporterFactory(
std::shared_ptr<EdenConfig> /*edenConfig*/) {
return MetadataImporter::getMetadataImporterFactory<
DefaultMetadataImporter>();
}
@ -272,6 +273,7 @@ int runEdenMain(EdenMain&& main, int argc, char** argv) {
identity, main.getLocalHostname(), main.getEdenfsVersion());
auto hiveLogger = main.getHiveLogger(sessionInfo, edenConfig);
auto metadataImporter = main.getMetadataImporterFactory(edenConfig);
server.emplace(
std::move(originalCommandLine),
@ -279,7 +281,7 @@ int runEdenMain(EdenMain&& main, int argc, char** argv) {
std::move(sessionInfo),
std::move(privHelper),
std::move(edenConfig),
main.getMetadataImporterFactory(),
std::move(metadataImporter),
main.getActivityRecorderFactory(),
std::move(hiveLogger),
main.getEdenfsVersion());

View File

@ -33,7 +33,8 @@ class EdenMain {
virtual void didFollyInit() = 0;
virtual void prepare(const EdenServer& server) = 0;
virtual void cleanup() = 0;
virtual MetadataImporterFactory getMetadataImporterFactory() = 0;
virtual MetadataImporterFactory getMetadataImporterFactory(
std::shared_ptr<EdenConfig> edenConfig) = 0;
virtual ActivityRecorderFactory getActivityRecorderFactory() = 0;
virtual std::shared_ptr<IHiveLogger> getHiveLogger(
SessionInfo sessionInfo,
@ -53,7 +54,8 @@ class DefaultEdenMain : public EdenMain {
virtual void didFollyInit() override;
virtual void prepare(const EdenServer& server) override;
virtual void cleanup() override {}
virtual MetadataImporterFactory getMetadataImporterFactory() override;
virtual MetadataImporterFactory getMetadataImporterFactory(
std::shared_ptr<EdenConfig> edenConfig) override;
virtual ActivityRecorderFactory getActivityRecorderFactory() override;
virtual std::shared_ptr<IHiveLogger> getHiveLogger(
SessionInfo sessionInfo,

View File

@ -380,7 +380,8 @@ EdenServiceHandler::EdenServiceHandler(
}
#ifdef EDEN_HAVE_USAGE_SERVICE
spServiceEndpoint_ = std::make_unique<EdenFSSmartPlatformServiceEndpoint>(
server_->getServerState()->getThreadPool());
server_->getServerState()->getThreadPool(),
server_->getServerState()->getEdenConfig());
#endif
}