Automated g4 rollback of changelist 775373266.
*** Reason for rollback ***
Intialization of tlBMC central config is too late, we need to initialize this in webserver_main_setup.hpp
*** Original change description ***
Add tlBMC allow_sensor_creation_failure configuration in server setup
To configure the tlBMC central configuration from a meson flag, we add configuration option parsing in https://gbmc-review.git.corp.google.com/c/gbmcweb/+/45934 and pass the flag to the GrpcRedfishService constructor. We invoke `InitializeTlbmcConfig` here to instantiate the tlBMC central config with the options provided.
#tlbmc
***
PiperOrigin-RevId: 775900344
Change-Id: I9268442923afa2f0ce17f219635bdc94ca4c8532
diff --git a/g3/server.cc b/g3/server.cc
index 1d6eb4b..0a8de77 100644
--- a/g3/server.cc
+++ b/g3/server.cc
@@ -75,7 +75,6 @@
#include "nlohmann/json.hpp"
#include "config_parser.h"
#include "oauth_utils.h"
-#include "tlbmc/central_config/config.h"
#include "tlbmc/hal/shared_mem/server.h"
#include "tlbmc/redfish/app.h"
#include "tlbmc/redfish/request.h"
@@ -1025,7 +1024,8 @@
std::unique_ptr<SubscriptionManager> subscription_manager;
if (config_.enable_hft_fake_manager) {
- auto fake_manager = std::make_unique<SubscriptionManagerFake>();
+ auto fake_manager =
+ std::make_unique<SubscriptionManagerFake>();
Payload payload;
HighFrequencySensorsReadings* readings =
payload.mutable_high_frequency_sensors_readings_batch()
@@ -1038,14 +1038,6 @@
fake_manager->SetFakeData(std::move(payload));
subscription_manager = std::move(fake_manager);
} else if (tlbmc_app != nullptr) {
- milotic_tlbmc::InitializeTlbmcConfig(
- {.allow_sensor_creation_failure =
- config.tlbmc_allow_sensor_creation_failure});
- LOG(WARNING)
- << "Tlbmc Config Settings: allow_dangling_frus: "
- << milotic_tlbmc::GetTlbmcConfig().allow_dangling_frus
- << " allow_sensor_creation_failure: "
- << milotic_tlbmc::GetTlbmcConfig().allow_sensor_creation_failure;
absl::StatusOr<std::unique_ptr<milotic_hft::DataSource>> data_source =
milotic_tlbmc::StoreHftAdapter::Create(tlbmc_app->GetStore());
if (data_source.ok()) {
diff --git a/g3/server.h b/g3/server.h
index 7029488..c9f7a29 100644
--- a/g3/server.h
+++ b/g3/server.h
@@ -99,9 +99,6 @@
// Enable HFT fake subscription manager.
bool enable_hft_fake_manager = false;
-
- // Allow sensor creation failures to not fail tlBMC store creation.
- bool tlbmc_allow_sensor_creation_failure = false;
};
// Checks server's creds state and request metadata/headers
