diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb')
2 files changed, 90 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Fix-Query-Parameters-issue.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Fix-Query-Parameters-issue.patch new file mode 100644 index 000000000..d4c629c5a --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Fix-Query-Parameters-issue.patch @@ -0,0 +1,44 @@ +From e40f454d5784570d497449775ae9f77f77973353 Mon Sep 17 00:00:00 2001 +From: "Arun P. Mohanan" <arun.p.m@linux.intel.com> +Date: Sat, 4 Dec 2021 01:28:38 +0530 +Subject: [PATCH] Fix Query Parameters issue + +Due to upstream change https://github.com/openbmc/bmcweb/commit/59b98b2222fddbea3d6f678d9e94006521f0c381, +none of the query parameters are functional in bmcweb. + +This commit adds the code required to copy the query parameters to +the crow request which is the actual request object used for handling +incoming URI requests. + +Tested: +GET on https://<BMC_IP>/redfish/v1/Systems/system/LogServices/EventLog/Entries +and https://<BMC_IP>/redfish/v1/Systems/system/LogServices/EventLog/Entries?skip=1000 + +Gave different logs indication correct functionality of skip query +parameter + +https://<BMC_IP>/redfish/v1/EventService/Subscriptions/SSE?$filter=(MessageId%20eq%20SELEntryAddedsaf) +Succesfully returned error indicating correct functionality of +query parameters as SELEntryAddedsaf is an invalid message id. + +Signed-off-by: Arun P. Mohanan <arun.p.m@linux.intel.com> +Signed-off-by: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> +--- + http/http_connection.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/http/http_connection.hpp b/http/http_connection.hpp +index cdd3707..940b8b8 100644 +--- a/http/http_connection.hpp ++++ b/http/http_connection.hpp +@@ -339,6 +339,7 @@ class Connection : + try + { + thisReq.urlView = boost::urls::url_view(thisReq.target()); ++ thisReq.urlParams = thisReq.urlView.params(); + thisReq.url = thisReq.urlView.encoded_path(); + } + catch (std::exception& p) +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Workaround-Increase-timer-queue-size-and-reduce-time.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Workaround-Increase-timer-queue-size-and-reduce-time.patch new file mode 100644 index 000000000..385f46279 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Workaround-Increase-timer-queue-size-and-reduce-time.patch @@ -0,0 +1,46 @@ +From e829c49701c3fe613d2ae57e45b9aad7b64cf569 Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" <jason.m.bills@linux.intel.com> +Date: Fri, 3 Dec 2021 08:48:53 -0800 +Subject: [PATCH] Workaround: Increase timer queue size and reduce timeout + +It appears that the EWS logout issue is caused when this timer +queue fills up on larger operations. As recommended by the bmcweb +maintainers in Discord, this change adds a workaround that both +increases the size of the queue and reduces the timeout to clear +it more quickly to avoid filling the queue. + +The issue is under investigation upstream to remove this workaround +in favor of the real fix. + +Tested: +Confirmed that loading the Overview, Event Logs, Inventory, and +Sensor pages repeatedly does not log out and return to the +login page. + +Change-Id: Ifa210e36ab8992225fde66acf6b6b0db5f32a3b4 +Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> +--- + http/timer_queue.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/http/timer_queue.hpp b/http/timer_queue.hpp +index 24a4ab4c..ff61e328 100644 +--- a/http/timer_queue.hpp ++++ b/http/timer_queue.hpp +@@ -11,11 +11,11 @@ + namespace crow + { + +-constexpr const size_t timerQueueTimeoutSeconds = 5; ++constexpr const size_t timerQueueTimeoutSeconds = 1; + namespace detail + { + +-constexpr const size_t maxSize = 100; ++constexpr const size_t maxSize = 400; + // fast timer queue for fixed tick value. + class TimerQueue + { +-- +2.17.1 + |