Rdk58255 delia68355 25q3 (#6310)

* Rdk 58255 main (#6307)

* RDKEMW-3216 : Resiliency improvements for Persistent Store (#6244)

* RDKEMW-3216 : Resiliency improvements for Persistent Store

Reason for change: Create or use backup on start.
Test Procedure: Corrupt store and reboot.
Risks: None
Signed-off-by: Nikita Poltorapavlo <[email protected]>

* combine copy-paste workflows

---------

Signed-off-by: Nikita Poltorapavlo <[email protected]>

* update changelog and api version

---------

Signed-off-by: Nikita Poltorapavlo <[email protected]>

* Delia 68355 main (#6308)

* RDKEMW-4795 : Account the case when ASSERT is no-op (#6256)

Reason for change: Code in ASSERT seemingly did not run
Test Procedure: Corrupt store is removed
Risks: None

Signed-off-by: Nikita Poltorapavlo <[email protected]>

* update changelog and api version

---------

Signed-off-by: Nikita Poltorapavlo <[email protected]>

---------

Signed-off-by: Nikita Poltorapavlo <[email protected]>

Author: npoltorapavlo

.github/workflows/L0-PersistentStore.yml

@@ -0,0 +1,61 @@
+name: PersistentStore
+
+on:
+  push:
+    paths:
+      - PersistentStore/**
+      - .github/workflows/*PersistentStore*.yml
+  pull_request:
+    paths:
+      - PersistentStore/**
+      - .github/workflows/*PersistentStore*.yml
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - src: 'PersistentStore/sqlite/l1test'
+            build: 'build/sqlitel1test'
+            test: 'sqlitel1test'
+          - src: 'PersistentStore/l0test'
+            build: 'build/persistentstorel0test'
+            test: 'persistentstorel0test'
+          - src: 'PersistentStore/l1test'
+            build: 'build/persistentstorel1test'
+            test: 'persistentstorel1test'
+          - src: 'PersistentStore'
+            build: 'build/PersistentStore'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+      - run: |
+          sudo apt update
+          sudo apt install -y valgrind cmake libsqlite3-dev
+      - run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
+      - run: |
+          cmake \
+            -S ${GITHUB_REPOSITORY}/${{ matrix.src }} \
+            -B ${{ matrix.build }} \
+            -DCMAKE_INSTALL_PREFIX="install" \
+            -DCMAKE_CXX_FLAGS="-Wall -Werror"
+          cmake --build ${{ matrix.build }} --target install
+      - if: ${{ matrix.test }}
+        run: |
+          PATH=${PWD}/install/bin:${PATH} \
+            LD_LIBRARY_PATH=${PWD}/install/lib:${LD_LIBRARY_PATH} \
+            valgrind --tool=memcheck --log-file=valgrind_log \
+            --leak-check=yes \
+            --show-reachable=yes \
+            --track-fds=yes \
+            --fair-sched=try \
+            ${{ matrix.test }}
+      - if: ${{ !env.ACT && matrix.test }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-${{ matrix.test }}
+          path: |
+            valgrind_log
+          if-no-files-found: warn

.github/workflows/L1-PersistentStore-sqlite.yml

@@ -16,6 +16,14 @@ 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.
 
+## [2.0.6] - 2025-06-30
+### Fixed
+- Account the case when ASSERT is no-op
+
+## [2.0.5] - 2025-06-30
+### Fixed
+- Create or use backup on start
+
 ## [2.0.4] - 2025-04-28
 ### Fixed
 - Handle file system corruption issue

.github/workflows/L1-PersistentStore.yml

@@ -22,7 +22,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 2
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 4
+#define API_VERSION_NUMBER_PATCH 6
 
 namespace WPEFramework {
 

.github/workflows/L2-PersistentStore.yml

@@ -87,9 +87,11 @@ namespace Plugin {
                 , _maxSize(maxSize)
                 , _maxValue(maxValue)
                 , _limit(limit)
+                , _corrupt(false)
             {
                 TempDirectoryCheck();
                 IntegrityCheck();
+                Backup();
                 Open();
             }
             ~Store2() override
@@ -115,23 +117,43 @@ namespace Plugin {
             void IntegrityCheck()
             {
                 Core::File file(_path);
-                Core::Directory(file.PathName().c_str()).CreatePath();
-                auto rc = sqlite3_open(_path.c_str(), &_data);
-                sqlite3_stmt* stmt;
-                sqlite3_prepare_v2(_data, "pragma integrity_check;",
-                    -1, &stmt, nullptr);
-                while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) {
-                    TRACE(Trace::Information,
-                        (_T("%s %s"), __FUNCTION__,
-                            (const char*)sqlite3_column_text(stmt, 0)));
+                if (file.Exists()) {
+                    sqlite3_open(file.Name().c_str(), &_data);
+                    auto rc = sqlite3_exec(_data,
+                        "pragma integrity_check;", 0, 0, 0);
+                    sqlite3_close_v2(_data);
+                    if ((rc == SQLITE_CORRUPT) || (rc == SQLITE_NOTADB)) {
+                        OnError(__FUNCTION__, rc);
+                        if (!file.Destroy()) {
+                            perror("remove failed");
+                        }
+                        _corrupt = true;
+                    }
                 }
-                sqlite3_finalize(stmt);
-                sqlite3_close_v2(_data);
-                if (rc != SQLITE_DONE) {
-                    OnError(__FUNCTION__, rc);
-                    if ((rc == SQLITE_MISUSE) || (rc == SQLITE_CORRUPT)) {
-                        ASSERT(file.Destroy());
+            }
+            void Backup()
+            {
+                Core::File file(_path);
+                Core::File fileB(_path + "-backup");
+                if (_corrupt ? fileB.Exists() : file.Exists()) {
+                    sqlite3* bkp;
+                    sqlite3_open(file.Name().c_str(), &_data);
+                    sqlite3_open(fileB.Name().c_str(), &bkp);
+                    auto to = _corrupt ? _data : bkp,
+                         from = _corrupt ? bkp : _data;
+                    auto ptr = sqlite3_backup_init(
+                        to, "main", from, "main");
+                    if (ptr != nullptr) {
+                        sqlite3_backup_step(ptr, -1);
+                        auto rc = sqlite3_backup_finish(ptr);
+                        if (rc != SQLITE_OK) {
+                            OnError(__FUNCTION__, rc);
+                        }
+                    } else {
+                        OnError(__FUNCTION__, sqlite3_errcode(to));
                     }
+                    sqlite3_close_v2(bkp);
+                    sqlite3_close_v2(_data);
                 }
             }
             void Open()
@@ -631,6 +653,7 @@ namespace Plugin {
             sqlite3* _data;
             std::list<INotification*> _clients;
             Core::CriticalSection _clientLock;
+            bool _corrupt;
         };
 
     } // namespace Sqlite