From cece6edaaaa8bc89a373210a802e51cb8941eb72 Mon Sep 17 00:00:00 2001 From: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com> Date: Thu, 18 Apr 2024 11:17:07 -0400 Subject: [PATCH 1/4] Merge pull request #5158 from rdkcentral/ES1-1055 ES1-1055 : Increase spawn process timeout --- PersistentStore/PersistentStore.cpp | 4 ++-- PersistentStore/l0test/ServiceMock.h | 1 + PersistentStore/l1test/ServiceMock.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp index caf8a730ed..cfce5e185c 100644 --- a/PersistentStore/PersistentStore.cpp +++ b/PersistentStore/PersistentStore.cpp @@ -93,7 +93,7 @@ namespace Plugin { uint32_t connectionId; - _deviceStore2 = service->Root(connectionId, 2000, _T("SqliteStore2")); + _deviceStore2 = service->Root(connectionId, RPC::CommunicationTimeOut, _T("SqliteStore2")); if (_deviceStore2 != nullptr) { _deviceStore2->Register(&_store2Sink); _deviceStore2->Register(_store); @@ -102,7 +102,7 @@ namespace Plugin { _deviceStoreLimit = _deviceStore2->QueryInterface(); } - _accountStore2 = service->Root(connectionId, 2000, _T("GrpcStore2")); + _accountStore2 = service->Root(connectionId, RPC::CommunicationTimeOut, _T("GrpcStore2")); if (_accountStore2 != nullptr) { _accountStore2->Register(&_store2Sink); } diff --git a/PersistentStore/l0test/ServiceMock.h b/PersistentStore/l0test/ServiceMock.h index f18d2c9c29..36c5c3c43d 100644 --- a/PersistentStore/l0test/ServiceMock.h +++ b/PersistentStore/l0test/ServiceMock.h @@ -23,6 +23,7 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::PluginHost::ISubSystem*, SubSystems, (), (override)); MOCK_METHOD(uint32_t, Submit, (const uint32_t, const WPEFramework::Core::ProxyType&), (override)); MOCK_METHOD(void, Notify, (const string&), (override)); + MOCK_METHOD(void, Notify, (const string&, const string&), (override)); MOCK_METHOD(void*, QueryInterfaceByCallsign, (const uint32_t, const string&), (override)); MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); MOCK_METHOD(void, Unregister, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); diff --git a/PersistentStore/l1test/ServiceMock.h b/PersistentStore/l1test/ServiceMock.h index f18d2c9c29..36c5c3c43d 100644 --- a/PersistentStore/l1test/ServiceMock.h +++ b/PersistentStore/l1test/ServiceMock.h @@ -23,6 +23,7 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::PluginHost::ISubSystem*, SubSystems, (), (override)); MOCK_METHOD(uint32_t, Submit, (const uint32_t, const WPEFramework::Core::ProxyType&), (override)); MOCK_METHOD(void, Notify, (const string&), (override)); + MOCK_METHOD(void, Notify, (const string&, const string&), (override)); MOCK_METHOD(void*, QueryInterfaceByCallsign, (const uint32_t, const string&), (override)); MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); MOCK_METHOD(void, Unregister, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); From e9b57769a11bdff2033534a5968ba086456940c5 Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Wed, 15 May 2024 14:03:13 +0300 Subject: [PATCH 2/4] update changelog and api version --- PersistentStore/CHANGELOG.md | 4 ++++ PersistentStore/PersistentStore.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PersistentStore/CHANGELOG.md b/PersistentStore/CHANGELOG.md index 593a204ccc..89b9831da2 100644 --- a/PersistentStore/CHANGELOG.md +++ b/PersistentStore/CHANGELOG.md @@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file. * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README. +## [1.0.10] - 2024-05-15 +### Fixed +- Increase spawn process timeout + ## [1.0.9] - 2024-04-01 ### Added - Get token from auth service, supply ids in the cloud calls diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp index cfce5e185c..f5b984b40b 100644 --- a/PersistentStore/PersistentStore.cpp +++ b/PersistentStore/PersistentStore.cpp @@ -25,7 +25,7 @@ #define API_VERSION_NUMBER_MAJOR 1 #define API_VERSION_NUMBER_MINOR 0 -#define API_VERSION_NUMBER_PATCH 9 +#define API_VERSION_NUMBER_PATCH 10 namespace WPEFramework { From 1a44352c8efc600f3a40b238e1fd8b1c3927d538 Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Fri, 19 Apr 2024 12:13:30 +0300 Subject: [PATCH 3/4] adapt ServiceMock to the recent changes in Thunder IShell interface --- PersistentStore/l0test/ServiceMock.h | 3 ++- PersistentStore/l1test/ServiceMock.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PersistentStore/l0test/ServiceMock.h b/PersistentStore/l0test/ServiceMock.h index 36c5c3c43d..02e1f5be25 100644 --- a/PersistentStore/l0test/ServiceMock.h +++ b/PersistentStore/l0test/ServiceMock.h @@ -33,7 +33,6 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(string, ProxyStubPath, (), (const, override)); MOCK_METHOD(string, HashKey, (), (const, override)); MOCK_METHOD(string, Substitute, (const string&), (const, override)); - MOCK_METHOD(WPEFramework::PluginHost::IShell::ICOMLink*, COMLink, (), (override)); MOCK_METHOD(uint32_t, Activate, (const reason), (override)); MOCK_METHOD(uint32_t, Deactivate, (const reason), (override)); MOCK_METHOD(uint32_t, Unavailable, (const reason), (override)); @@ -48,6 +47,8 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::Core::hresult, Resumed, (const bool value), (override)); MOCK_METHOD(WPEFramework::Core::hresult, Metadata, (string & info /* @out */), (const, override)); MOCK_METHOD(WPEFramework::Core::hresult, Hibernate, (const uint32_t timeout), (override)); + MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IShell::IConnectionServer::INotification * sink), (override)); + MOCK_METHOD(void, Unregister, (const WPEFramework::PluginHost::IShell::IConnectionServer::INotification* sink), (override)); BEGIN_INTERFACE_MAP(ServiceMock) INTERFACE_ENTRY(IShell) END_INTERFACE_MAP diff --git a/PersistentStore/l1test/ServiceMock.h b/PersistentStore/l1test/ServiceMock.h index 36c5c3c43d..02e1f5be25 100644 --- a/PersistentStore/l1test/ServiceMock.h +++ b/PersistentStore/l1test/ServiceMock.h @@ -33,7 +33,6 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(string, ProxyStubPath, (), (const, override)); MOCK_METHOD(string, HashKey, (), (const, override)); MOCK_METHOD(string, Substitute, (const string&), (const, override)); - MOCK_METHOD(WPEFramework::PluginHost::IShell::ICOMLink*, COMLink, (), (override)); MOCK_METHOD(uint32_t, Activate, (const reason), (override)); MOCK_METHOD(uint32_t, Deactivate, (const reason), (override)); MOCK_METHOD(uint32_t, Unavailable, (const reason), (override)); @@ -48,6 +47,8 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::Core::hresult, Resumed, (const bool value), (override)); MOCK_METHOD(WPEFramework::Core::hresult, Metadata, (string & info /* @out */), (const, override)); MOCK_METHOD(WPEFramework::Core::hresult, Hibernate, (const uint32_t timeout), (override)); + MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IShell::IConnectionServer::INotification * sink), (override)); + MOCK_METHOD(void, Unregister, (const WPEFramework::PluginHost::IShell::IConnectionServer::INotification* sink), (override)); BEGIN_INTERFACE_MAP(ServiceMock) INTERFACE_ENTRY(IShell) END_INTERFACE_MAP From 0a8d80d9766db03d7829403d2183c3e1d453b067 Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Wed, 1 May 2024 17:42:42 +0300 Subject: [PATCH 4/4] adapt ServiceMock to the recent changes in Thunder IShell interface --- PersistentStore/l0test/ServiceMock.h | 2 -- PersistentStore/l1test/ServiceMock.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/PersistentStore/l0test/ServiceMock.h b/PersistentStore/l0test/ServiceMock.h index 02e1f5be25..2783b3e449 100644 --- a/PersistentStore/l0test/ServiceMock.h +++ b/PersistentStore/l0test/ServiceMock.h @@ -47,8 +47,6 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::Core::hresult, Resumed, (const bool value), (override)); MOCK_METHOD(WPEFramework::Core::hresult, Metadata, (string & info /* @out */), (const, override)); MOCK_METHOD(WPEFramework::Core::hresult, Hibernate, (const uint32_t timeout), (override)); - MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IShell::IConnectionServer::INotification * sink), (override)); - MOCK_METHOD(void, Unregister, (const WPEFramework::PluginHost::IShell::IConnectionServer::INotification* sink), (override)); BEGIN_INTERFACE_MAP(ServiceMock) INTERFACE_ENTRY(IShell) END_INTERFACE_MAP diff --git a/PersistentStore/l1test/ServiceMock.h b/PersistentStore/l1test/ServiceMock.h index 02e1f5be25..2783b3e449 100644 --- a/PersistentStore/l1test/ServiceMock.h +++ b/PersistentStore/l1test/ServiceMock.h @@ -47,8 +47,6 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::Core::hresult, Resumed, (const bool value), (override)); MOCK_METHOD(WPEFramework::Core::hresult, Metadata, (string & info /* @out */), (const, override)); MOCK_METHOD(WPEFramework::Core::hresult, Hibernate, (const uint32_t timeout), (override)); - MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IShell::IConnectionServer::INotification * sink), (override)); - MOCK_METHOD(void, Unregister, (const WPEFramework::PluginHost::IShell::IConnectionServer::INotification* sink), (override)); BEGIN_INTERFACE_MAP(ServiceMock) INTERFACE_ENTRY(IShell) END_INTERFACE_MAP