From 2a64b8ae9b952b18b4aef38cb7c41ce6dba16c50 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Mon, 24 May 2021 12:54:37 -0700 Subject: Update to internal 0.52 Signed-off-by: Jason M. Bills --- ...003-Move-EventService-init-to-later-stage.patch | 50 ---------------------- ...tyle-subscription-support-to-eventservice.patch | 32 +++++++------- .../0006-Add-EventService-SSE-filter-support.patch | 8 ++-- .../interfaces/bmcweb/eventservice/README | 3 -- 4 files changed, 20 insertions(+), 73 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0003-Move-EventService-init-to-later-stage.patch (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0003-Move-EventService-init-to-later-stage.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0003-Move-EventService-init-to-later-stage.patch deleted file mode 100644 index f910915ce..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0003-Move-EventService-init-to-later-stage.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2dcfef0170ca5ba1f934de6934db64b545ab3b55 Mon Sep 17 00:00:00 2001 -From: AppaRao Puli -Date: Tue, 23 Mar 2021 23:36:40 +0000 -Subject: [PATCH] Move EventService init to later stage - -The bmcweb crash issue seen when there is eventservice -config with subscriptions in persistent file. - -During EventService instantiation, it uses the "get_io_context()" -from systemBus, so it should be called after systemBus init. So -moved the EventService instantiation after systemBus initialization. - -Tested: - - bmcweb crash issue resolved. - -Signed-off-by: AppaRao Puli -Change-Id: Iab52f0e89478e306af475066fb5691153a05677d ---- - src/webserver_main.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp -index 3b9631a..f0e2207 100644 ---- a/src/webserver_main.cpp -+++ b/src/webserver_main.cpp -@@ -80,9 +80,6 @@ int main(int /*argc*/, char** /*argv*/) - #ifdef BMCWEB_ENABLE_REDFISH - crow::redfish::requestRoutes(app); - redfish::RedfishService redfish(app); -- -- // Create EventServiceManager instance and initialize Config -- redfish::EventServiceManager::getInstance(); - #endif - - #ifdef BMCWEB_ENABLE_DBUS_REST -@@ -116,6 +113,11 @@ int main(int /*argc*/, char** /*argv*/) - crow::connections::systemBus = - std::make_shared(*io); - -+#ifdef BMCWEB_ENABLE_REDFISH -+ // Create EventServiceManager instance and initialize Config -+ redfish::EventServiceManager::getInstance(); -+#endif -+ - #ifdef BMCWEB_ENABLE_VM_NBDPROXY - crow::nbd_proxy::requestRoutes(app); - #endif --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch index e2eaf1761..02d28833f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch @@ -1,4 +1,4 @@ -From dbaf8c1dc402da97fec723d050e063cd283d8736 Mon Sep 17 00:00:00 2001 +From 698d2615c5bc30ab7f89f11ed5659df8bf248ea0 Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Tue, 16 Mar 2021 15:37:24 +0000 Subject: [PATCH 5/6] Add SSE style subscription support to eventservice @@ -126,10 +126,10 @@ index 0000000..6c98e6e +} // namespace eventservice_sse +} // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 148c703..e3eba86 100644 +index 5821e2e..f4d57c2 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -22,13 +22,15 @@ +@@ -23,13 +23,15 @@ #include #include @@ -146,7 +146,7 @@ index 148c703..e3eba86 100644 #include #include #include -@@ -45,9 +47,13 @@ using EventServiceConfig = std::tuple; +@@ -46,9 +48,13 @@ using EventServiceConfig = std::tuple; static constexpr const char* eventFormatType = "Event"; static constexpr const char* metricReportFormatType = "MetricReport"; @@ -160,8 +160,8 @@ index 148c703..e3eba86 100644 #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES static std::optional inotifyConn; static constexpr const char* redfishEventLogDir = "/var/log"; -@@ -390,11 +396,9 @@ class Subscription - path); +@@ -391,11 +397,9 @@ class Subscription + path, uriProto); } - Subscription(const std::shared_ptr& adaptor) : @@ -175,7 +175,7 @@ index 148c703..e3eba86 100644 ~Subscription() = default; -@@ -419,7 +423,7 @@ class Subscription +@@ -420,7 +424,7 @@ class Subscription if (sseConn != nullptr) { @@ -184,7 +184,7 @@ index 148c703..e3eba86 100644 } } -@@ -509,6 +513,7 @@ class Subscription +@@ -510,6 +514,7 @@ class Subscription this->sendEvent( msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); @@ -192,7 +192,7 @@ index 148c703..e3eba86 100644 } #endif -@@ -579,14 +584,39 @@ class Subscription +@@ -565,14 +570,39 @@ class Subscription return eventSeqNum; } @@ -233,7 +233,7 @@ index 148c703..e3eba86 100644 }; static constexpr const bool defaultEnabledState = true; -@@ -977,6 +1007,8 @@ class EventServiceManager +@@ -963,6 +993,8 @@ class EventServiceManager subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); subValue->updateRetryPolicy(); @@ -242,7 +242,7 @@ index 148c703..e3eba86 100644 return id; } -@@ -1001,11 +1033,40 @@ class EventServiceManager +@@ -987,11 +1019,40 @@ class EventServiceManager } } @@ -603,7 +603,7 @@ index be6f04d..1875ec9 100644 {{"@odata.id", "/redfish/v1/EventService/Subscriptions"}}}, {"Actions", diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp -index 3b9631a..bf8e705 100644 +index 902c32b..c871faa 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -5,6 +5,7 @@ @@ -614,14 +614,14 @@ index 3b9631a..bf8e705 100644 #include #include #include -@@ -79,6 +80,7 @@ int main(int /*argc*/, char** /*argv*/) - +@@ -83,6 +84,7 @@ int main(int /*argc*/, char** /*argv*/) #ifdef BMCWEB_ENABLE_REDFISH - crow::redfish::requestRoutes(app); -+ redfish::eventservice_sse::requestRoutes(app); + redfish::requestRoutes(app); redfish::RedfishService redfish(app); ++ redfish::eventservice_sse::requestRoutes(app); // Create EventServiceManager instance and initialize Config + redfish::EventServiceManager::getInstance(); -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch index e83e05c96..4d99b2754 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch @@ -1,4 +1,4 @@ -From 693de7b901e7618585e0e8d848fc37fa0cccd18e Mon Sep 17 00:00:00 2001 +From 82185c52ae6e27cc1e086654a3b7d10e63ecc783 Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Wed, 17 Mar 2021 01:16:50 +0000 Subject: [PATCH 6/6] Add EventService SSE filter support @@ -171,10 +171,10 @@ index 7dfdc80..922dae9 100644 } // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index e3eba86..8f120b1 100644 +index f4d57c2..567fb9c 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -54,6 +54,11 @@ static constexpr const char* eventServiceFile = +@@ -55,6 +55,11 @@ static constexpr const char* eventServiceFile = static constexpr const uint8_t maxNoOfSubscriptions = 20; static constexpr const uint8_t maxNoOfSSESubscriptions = 10; @@ -202,7 +202,7 @@ index 1875ec9..4d1ac9f 100644 "TerminateAfterRetries", "SuspendRetries", "RetryForever"}; diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp -index cfbc9c2..3493132 100644 +index 7059a38..1e3ef2f 100644 --- a/redfish-core/src/error_messages.cpp +++ b/redfish-core/src/error_messages.cpp @@ -2147,6 +2147,32 @@ void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README index 55340bb5c..3954e89c1 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README @@ -9,9 +9,6 @@ Upstream revision information: - EventService: https client support https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/31735/38 - - Move EventService init to later stage - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41516 - - Add Server-Sent-Events support https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41258/5 -- cgit v1.2.3