diff --git a/mcrouter/McrouterLogger.cpp b/mcrouter/McrouterLogger.cpp index 47eba2df4..3effe2af2 100644 --- a/mcrouter/McrouterLogger.cpp +++ b/mcrouter/McrouterLogger.cpp @@ -162,6 +162,7 @@ bool McrouterLogger::start() { } else { // If default path is not available and TW backup is enabled, try backup // path +#ifndef MCROUTER_OSS_BUILD if (router_.opts().enable_tw_crash_config_backup_path && additionalLogger_) { auto backupPath = additionalLogger_->getBackupStatsRootPath(); @@ -177,11 +178,14 @@ bool McrouterLogger::start() { return false; } } else { +#endif LOG(WARNING) << "Can't create or chmod " << router_.opts().stats_root << ", disabling stats logging"; return false; } +#ifndef MCROUTER_OSS_BUILD } +#endif boost::filesystem::path path(statsRoot_); path /= getStatPrefix(router_.opts()) + "." + kStatsStartupOptionsSfx; diff --git a/mcrouter/lib/carbon/Makefile.am b/mcrouter/lib/carbon/Makefile.am index 30484c517..7860aaa29 100644 --- a/mcrouter/lib/carbon/Makefile.am +++ b/mcrouter/lib/carbon/Makefile.am @@ -29,7 +29,7 @@ gen-cpp2/carbon_result_types.h: gen-cpp2/carbon_result_types_custom_protocol.h gen-cpp2/carbon_result_types_custom_protocol.h: gen-cpp2/carbon_result_data.cpp gen-cpp2/carbon_result_data.cpp: gen-cpp2/carbon_result_data.h gen-cpp2/carbon_result_data.h: carbon_result.thrift - @FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,include_prefix=mcrouter/lib/carbon/ carbon_result.thrift + @FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,include_prefix=mcrouter/lib/carbon/ -I $(INSTALL_DIR)/include/ carbon_result.thrift gen-cpp2/carbon_types.cpp: gen-cpp2/carbon_types.h gen-cpp2/carbon_types_binary.cpp: gen-cpp2/carbon_types.h diff --git a/mcrouter/test/cpp_unit_tests/options_test.cpp b/mcrouter/test/cpp_unit_tests/options_test.cpp index b3bca55dc..5b4b82997 100644 --- a/mcrouter/test/cpp_unit_tests/options_test.cpp +++ b/mcrouter/test/cpp_unit_tests/options_test.cpp @@ -50,9 +50,11 @@ TEST(OptionsSetFromDictTest, sanity) { /* unchanged */ EXPECT_TRUE(opts.num_proxies == 4); +#ifndef MCROUTER_OSS_BUILD dict.clear(); dict["enable_tw_crash_config_backup_path"] = "1"; e = opts.updateFromDict(dict); EXPECT_TRUE(e.empty()); EXPECT_TRUE(opts.enable_tw_crash_config_backup_path); +#endif }