Log platform exploration time to ODS

Reviewed By: Scott8440

Differential Revision: D91080767

fbshipit-source-id: 22999bc472a22895fa839ae59b5df049f2513e8a

Author: somasun

fboss/platform/platform_manager/Main.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2004-present, Meta Platforms, Inc. and affiliates.
 // All Rights Reserved.
 
+#include <chrono>
 #include <cstdlib>
 #include <stdexcept>
 
@@ -58,11 +59,32 @@ int main(int argc, char** argv) {
     dataStore.emplace(config);
     scubaLogger.emplace(*config.platformName(), dataStore.value());
 
+    auto startTime = std::chrono::steady_clock::now();
     PkgManager pkgManager(config);
     pkgManager.processAll();
     PlatformExplorer platformExplorer(
         config, dataStore.value(), scubaLogger.value());
     platformExplorer.explore();
+    auto endTime = std::chrono::steady_clock::now();
+
+    // Calculate elapsed time in seconds
+    auto elapsedSeconds =
+        std::chrono::duration_cast<std::chrono::seconds>(endTime - startTime)
+            .count();
+
+    // Publish exploration time counters
+    if (pkgManager.wereKmodsUnloaded()) {
+      fb303::fbData->setCounter(
+          "package_manager.exploration_time.with_kmod_unload", elapsedSeconds);
+    } else {
+      fb303::fbData->setCounter(
+          "package_manager.exploration_time.without_kmod_unload",
+          elapsedSeconds);
+    }
+    XLOG(INFO) << fmt::format(
+        "Exploration complete in {} seconds. Kmods were {}reloaded.",
+        elapsedSeconds,
+        pkgManager.wereKmodsUnloaded() ? "" : "NOT ");
 
     if (FLAGS_run_once) {
       XLOG(INFO) << fmt::format(

fboss/platform/platform_manager/PkgManager.cpp

@@ -429,6 +429,7 @@ void PkgManager::unloadBspKmods() const {
           "Skipping to unload {}. Reason: Already unloaded", kmod);
     }
   }
+  kmodsUnloaded_ = true;
 }
 
 void PkgManager::loadRequiredKmods() const {
@@ -502,4 +503,8 @@ std::string PkgManager::getKmodsRpmBaseWithKernelName() const {
       *platformConfig_.bspKmodsRpmName(),
       systemInterface_->getHostKernelVersion());
 }
+
+bool PkgManager::wereKmodsUnloaded() const {
+  return kmodsUnloaded_;
+}
 } // namespace facebook::fboss::platform::platform_manager

fboss/platform/platform_manager/PkgManager.h

@@ -62,6 +62,7 @@ class PkgManager {
   virtual void loadRequiredKmods() const;
   void removeInstalledRpms() const;
   BspKmodsFile readKmodsFile() const;
+  bool wereKmodsUnloaded() const;
 
  private:
   std::string getKmodsRpmName() const;
@@ -71,6 +72,7 @@ class PkgManager {
   const PlatformConfig& platformConfig_;
   const std::shared_ptr<package_manager::SystemInterface> systemInterface_;
   const std::shared_ptr<PlatformFsUtils> platformFsUtils_;
+  mutable bool kmodsUnloaded_{false};
 };
 
 } // namespace facebook::fboss::platform::platform_manager

fboss/platform/platform_manager/tests/PkgManagerTest.cpp

@@ -301,9 +301,12 @@ TEST_F(PkgManagerTest, unloadBspKmods) {
               *platformConfig_.bspKmodsRpmName())))
       .WillOnce(Return(std::vector<std::string>{}));
   EXPECT_CALL(*mockSystemInterface_, lsmod()).Times(0);
+  EXPECT_FALSE(pkgManager_.wereKmodsUnloaded());
   EXPECT_NO_THROW(pkgManager_.unloadBspKmods());
+  EXPECT_FALSE(pkgManager_.wereKmodsUnloaded());
   EXPECT_EQ(
       facebook::fb303::fbData->getCounter(PkgManager::kUnloadKmodsFailure), 0);
+
   // No kmods.json when it should exist
   EXPECT_CALL(*mockPlatformFsUtils_, getStringFileContent(_))
       .WillOnce(Return(std::nullopt));
@@ -317,8 +320,10 @@ TEST_F(PkgManagerTest, unloadBspKmods) {
           std::vector<std::string>{
               "fboss_bsp_kmods-6.4.3-0_fbk1_755_ga25447393a1d-2.4.0-1"}));
   EXPECT_THROW(pkgManager_.unloadBspKmods(), std::runtime_error);
+  EXPECT_FALSE(pkgManager_.wereKmodsUnloaded());
   EXPECT_EQ(
       facebook::fb303::fbData->getCounter(PkgManager::kUnloadKmodsFailure), 1);
+
   // kmods.json exist and all kmods are loaded
   EXPECT_CALL(*mockPlatformFsUtils_, getStringFileContent(_))
       .WillOnce(Return(jsonBspKmodsFile_));
@@ -333,8 +338,10 @@ TEST_F(PkgManagerTest, unloadBspKmods) {
           bspKmodsFile_.bspKmods()->size())
       .WillRepeatedly(Return(true));
   EXPECT_NO_THROW(pkgManager_.unloadBspKmods());
+  EXPECT_TRUE(pkgManager_.wereKmodsUnloaded());
   EXPECT_EQ(
       facebook::fb303::fbData->getCounter(PkgManager::kUnloadKmodsFailure), 0);
+
   // kmods.json exists but unload fails
   EXPECT_CALL(*mockPlatformFsUtils_, getStringFileContent(_))
       .WillOnce(Return(jsonBspKmodsFile_));
@@ -345,15 +352,18 @@ TEST_F(PkgManagerTest, unloadBspKmods) {
           ranges::to<std::set<std::string>>));
   EXPECT_CALL(*mockSystemInterface_, unloadKmod(_)).WillOnce(Return(false));
   EXPECT_THROW(pkgManager_.unloadBspKmods(), std::runtime_error);
+  EXPECT_TRUE(pkgManager_.wereKmodsUnloaded());
   EXPECT_EQ(
       facebook::fb303::fbData->getCounter(PkgManager::kUnloadKmodsFailure), 1);
+
   // kmods.json exist and all kmods aren't loaded
   EXPECT_CALL(*mockPlatformFsUtils_, getStringFileContent(_))
       .WillOnce(Return(jsonBspKmodsFile_));
   EXPECT_CALL(*mockSystemInterface_, lsmod())
       .WillOnce(Return(std::set<std::string>{}));
   EXPECT_CALL(*mockSystemInterface_, unloadKmod(_)).Times(0);
   EXPECT_NO_THROW(pkgManager_.unloadBspKmods());
+  EXPECT_TRUE(pkgManager_.wereKmodsUnloaded());
   EXPECT_EQ(
       facebook::fb303::fbData->getCounter(PkgManager::kUnloadKmodsFailure), 0);
 }