Feature/rdkemw 18459 inotify

backup_logs/include/backup_logs.h

@@ -26,6 +26,13 @@
 extern "C" {
 #endif
 
+/** Sentinel written by backup_logs after successful completion.
+ *  Cross-repo interface: also referenced by reboot-manager's update-prev-reboot-info
+ *  and telemetry's telemetry2_0.
+ *  Any path change MUST be coordinated with the reboot-manager and telemetry repositories. */
+
+#define BACKUP_LOGS_DONE_FLAG  "/tmp/.backup_logs_done"
+
 /**
  * @brief Main entry point for backup_logs system
  * 

backup_logs/src/backup_logs.c

@@ -33,6 +33,8 @@
 #include "special_files.h"
 #include "system_utils.h"
 #include <secure_wrapper.h>
+#include <fcntl.h>
+#include <errno.h>
 
 #define BACKUP_LOGS_VERSION "1.0.0"
 #define BACKUP_LOGS_BUILD_DATE __DATE__
@@ -302,6 +304,22 @@ int backup_logs_main(int argc, char *argv[]) {
     }
 
     RDK_LOG(RDK_LOG_INFO, LOG_BACKUP_LOGS, "Backup process completed successfully\n");
+    /* Write completion sentinel for downstream consumers (reboot-manager, telemetry).
+     * /tmp/ is volatile — no stale-sentinel risk across reboots.
+     * Non-fatal: if open() fails, downstream services will time out and annotate gracefully. */
+    {
+        int sentinel_fd = open(BACKUP_LOGS_DONE_FLAG, O_CREAT | O_WRONLY, 0644);
+        if (sentinel_fd < 0) 
+        {
+            RDK_LOG(RDK_LOG_WARN, LOG_BACKUP_LOGS, "Failed to create sentinel %s: %s\n", BACKUP_LOGS_DONE_FLAG, strerror(errno));
+        } 
+        else 
+        {
+            close(sentinel_fd);
+            RDK_LOG(RDK_LOG_INFO, LOG_BACKUP_LOGS, "Sentinel written: %s\n", BACKUP_LOGS_DONE_FLAG);
+        }
+    }
+
     return EXIT_SUCCESS;
 }
 #ifndef GTEST_ENABLE

dcm.c

@@ -37,7 +37,6 @@
 #include "dcm_rbus.h"
 #include "dcm_cronparse.h"
 #include "dcm_schedjob.h"
-#include "uploadstblogs.h"
 
 static DCMDHandle *g_pdcmHandle = NULL;
 
@@ -69,42 +68,7 @@ static VOID dcmRunJobs(const INT8* profileName, VOID *pHandle)
         pRDKPath = DCM_LIB_PATH;
     }
 
-    if(strcmp(profileName, DCM_LOGUPLOAD_SCHED) == 0) {
-        INT8 *pPrctl = dcmSettingsGetUploadProtocol(pdcmHandle->pDcmSetHandle);
-        INT8 *pURL   = dcmSettingsGetUploadURL(pdcmHandle->pDcmSetHandle);
-
-        if(pPrctl == NULL) {
-            DCMWarn("Log Upload protocol is NULL, using HTTP\n");
-            pPrctl = "HTTP";
-        }
-        if(pURL == NULL) {
-            DCMWarn("Log Upload URL is NULL, using %s\n", DCM_DEF_LOG_URL);
-            pURL = DCM_DEF_LOG_URL;
-        }
-
-        DCMInfo("\nStart log upload via library API\n");
-
-        // Call uploadstblogs library API instead of shell script
-        UploadSTBLogsParams params = {
-            .flag = 0,
-            .dcm_flag = 1,
-            .upload_on_reboot = false,
-            .upload_protocol = pPrctl,
-            .upload_http_link = pURL,
-            .trigger_type = TRIGGER_SCHEDULED,
-            .rrd_flag = false,
-            .rrd_file = NULL
-        };
-#ifndef GTEST_ENABLE
-        int result = uploadstblogs_run(&params);
-        if (result != 0) {
-            DCMError("Log upload failed with error code: %d\n", result);
-        } else {
-            DCMInfo("Log upload completed successfully\n");
-        }
-#endif
-    }
-    else if(strcmp(profileName, DCM_DIFD_SCHED) == 0) {
+    if(strcmp(profileName, DCM_DIFD_SCHED) == 0) {
         DCMInfo("Start FW update Script\n");
         snprintf(pExecBuff, EXECMD_BUFF_SIZE, "/bin/sh %s/swupdate_utility.sh 0 2 >> /opt/logs/swupdate.log 2>&1",
                                                pRDKPath);
@@ -202,15 +166,6 @@ INT32 dcmDaemonMainInit(DCMDHandle *pdcmHandle)
         return ret;
     }
 
-    /* Add log upload job to Schecduler */
-    pdcmHandle->pLogSchedHandle  = dcmSchedAddJob(DCM_LOGUPLOAD_SCHED,
-                                                  (DCMSchedCB)dcmRunJobs,
-                                                  (VOID *) pdcmHandle);
-    if(pdcmHandle->pLogSchedHandle == NULL) {
-        DCMError("Failed to Add Log Scheduler jobs\n");
-        return DCM_FAILURE;
-    }
-
     /* Add FW update job to Schecduler */
     pdcmHandle->pDifdSchedHandle = dcmSchedAddJob(DCM_DIFD_SCHED,
                                                   (DCMSchedCB)dcmRunJobs,
@@ -241,9 +196,7 @@ VOID dcmDaemonMainUnInit(DCMDHandle *pdcmHandle)
 
     dcmSettingsUnInit(pdcmHandle->pDcmSetHandle);
     dcmRbusUnInit(pdcmHandle->pRbusHandle);
-    dcmSchedStopJob(pdcmHandle->pLogSchedHandle);
     dcmSchedStopJob(pdcmHandle->pDifdSchedHandle);
-    dcmSchedRemoveJob(pdcmHandle->pLogSchedHandle);
     dcmSchedRemoveJob(pdcmHandle->pDifdSchedHandle);
     dcmSchedUnInit();
 
@@ -368,11 +321,11 @@ int main(int argc, char* argv[])
                 continue;
             }
 
+            INT8 unusedLogCron[16] = {0};
             ret = dcmSettingParseConf(g_pdcmHandle->pDcmSetHandle, pconfPath,
-                                      g_pdcmHandle->logCron,
+                                      unusedLogCron,
                                       g_pdcmHandle->difdCron);
             if(ret == DCM_SUCCESS) {
-                dcmSchedStartJob(g_pdcmHandle->pLogSchedHandle, g_pdcmHandle->logCron);
                 dcmSchedStartJob(g_pdcmHandle->pDifdSchedHandle, g_pdcmHandle->difdCron);
 
                 ret = dcmIARMEvntSend(DCM_IARM_COMPLETE);

dcm.h

@@ -26,7 +26,6 @@ extern "C"
 {
 #endif
 
-#define DCM_LOGUPLOAD_SCHED    "DCM_LOG_UPLOAD"
 #define DCM_DIFD_SCHED         "DCM_FW_UPDATE"
 
 typedef struct _dcmdHandle
@@ -35,10 +34,8 @@ typedef struct _dcmdHandle
     BOOL  isDCMRunning;
     VOID *pRbusHandle;
     VOID *pDcmSetHandle;
-    VOID *pLogSchedHandle;
     VOID *pDifdSchedHandle;
     INT8 *pExecBuff;
-    INT8  logCron[16];
     INT8  difdCron[16];
 
 } DCMDHandle;

dcm_parseconf.c

@@ -37,7 +37,6 @@
 #include "dcm_utils.h"
 #include "dcm_rbus.h"
 #include "dcm_parseconf.h"
-#include "uploadstblogs.h"
 
 static INT32 g_bMMEnable = 0;
 
@@ -578,72 +577,6 @@ INT32 dcmSettingParseConf(VOID *pHandle, INT8 *pConffile,
 
     DCMInfo("DCM_DIFD_CRON: %s\n", pDifdCron);
 
-    if(uploadCheck == 1 && pdcmSetHandle->bRebootFlag == 0) {
-        DCMInfo("Triggering log upload with reboot flag via library API\n");
-        UploadSTBLogsParams params = {
-            .flag = 1,
-            .dcm_flag = 1,
-            .upload_on_reboot = true,
-            .upload_protocol = pUploadprtl,
-            .upload_http_link = pUploadURL,
-            .trigger_type = TRIGGER_REBOOT,
-            .rrd_flag = false,
-            .rrd_file = NULL
-        };
-#ifndef GTEST_ENABLE
-        int result = uploadstblogs_run(&params);
-        if (result != 0) {
-            DCMError("Log upload (reboot=true) failed: %d\n", result);
-        }
-#endif
-    }
-    else if (uploadCheck == 0 && pdcmSetHandle->bRebootFlag == 0) {
-        DCMInfo("Triggering log upload without reboot flag via library API\n");
-        UploadSTBLogsParams params = {
-            .flag = 1,
-            .dcm_flag = 1,
-            .upload_on_reboot = false,
-            .upload_protocol = pUploadprtl,
-            .upload_http_link = pUploadURL,
-            .trigger_type = TRIGGER_SCHEDULED,
-            .rrd_flag = false,
-            .rrd_file = NULL
-        };
-#ifndef GTEST_ENABLE
-        int result = uploadstblogs_run(&params);
-        if (result != 0) {
-            DCMError("Log upload (reboot=false) failed: %d\n", result);
-        }
-#endif
-    }
-    else {
-        DCMWarn ("Nothing to do here for uploadCheck value = %d\n", uploadCheck);
-    }
-
-    if(strlen(pLogCron) == 0) {
-        DCMWarn ("Uploading logs as DCM response is either null or not present\n");
-
-        UploadSTBLogsParams params = {
-            .flag = 1,
-            .dcm_flag = 1,
-            .upload_on_reboot = false,
-            .upload_protocol = pUploadprtl,
-            .upload_http_link = pUploadURL,
-            .trigger_type = TRIGGER_SCHEDULED,
-            .rrd_flag = false,
-            .rrd_file = NULL
-        };
-#ifndef GTEST_ENABLE
-        int result = uploadstblogs_run(&params);
-        if (result != 0) {
-            DCMError("Log upload (empty cron) failed: %d\n", result);
-        }
-#endif
-    }
-    else {
-        DCMInfo ("%s is present setting cron jobs\n", DCM_LOGUPLOAD_CRON);
-    }
-
     if(strlen(pDifdCron) == 0) {
         DCMWarn ("difdCron is empty\n");
     }

test/functional-tests/tests/test_log_upload_cron_NULL_case.py

@@ -25,16 +25,11 @@
 import json
 
 @pytest.mark.run(order=1)
-def test_upload_cron_present():
+def test_fw_cron_scheduled():
     kill_dcmd(9)
     kill_telemetry(9)
-    rbus_set_data("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Telemetry.ConfigURL", "string", "https://mockxconf:50050/loguploader5/getT2DCMSettings")
     run_dcmd()
+    rbus_set_data("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Telemetry.ConfigURL", "string", "https://mockxconf:50050/loguploader5/getT2DCMSettings")
     run_telemetry()
-    sleep(20)
-    assert "Uploading logs as DCM response is either null or not present" in grep_dcmdlogs("Uploading logs as DCM response is either null or not present")
-
-@pytest.mark.run(order=2)
-def test_fw_cron_scheduled():
     assert "difdCron is empty" in grep_dcmdlogs("difdCron is empty")
 

test/functional-tests/tests/test_log_upload_onreboot_MM_case.py

@@ -34,10 +34,6 @@ def test_upload_cron_present():
     sleep(420)
 
 @pytest.mark.run(order=2)
-def test_upload_cron_scheduled():
-    assert "Scheduling DCM_LOG_UPLOAD Job handle"  in grep_dcmdlogs("Scheduling DCM_LOG_UPLOAD Job handle")
-
-@pytest.mark.run(order=3)
 def test_fw_cron_scheduled():
     assert "Scheduling DCM_FW_UPDATE Job handle" in grep_dcmdlogs("Scheduling DCM_FW_UPDATE Job handle")
 

test/functional-tests/tests/test_log_upload_onreboot_false_case.py

@@ -25,35 +25,10 @@
 import json
 
 @pytest.mark.run(order=1)
-def test_upload_cron_present():
-    kill_dcmd(9)
-    kill_telemetry(9)
-    rbus_set_data("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Telemetry.ConfigURL", "string", "https://mockxconf:50050/loguploader4/getT2DCMSettings")
-    run_dcmd()
-    run_telemetry()
-    sleep(20)
-    assert "urn:settings:LogUploadSettings:UploadSchedule:cron" in grep_dcmdlogs("is present setting cron jobs")
-
-@pytest.mark.run(order=2)
-def test_upload_script_started_onboot_false():
-    assert "Triggering log upload without reboot flag via library API" in grep_dcmdlogs("Triggering log upload without reboot flag via library API")
-    sleep(420)
-
-@pytest.mark.run(order=3)
 def test_fw_cron_scheduled():
     assert "Scheduling DCM_FW_UPDATE Job handle" in grep_dcmdlogs("Scheduling DCM_FW_UPDATE Job handle")
 
-
-@pytest.mark.run(order=4)
-def test_upload_cron_scheduled():
-    assert "Scheduling DCM_LOG_UPLOAD Job handle"  in grep_dcmdlogs("Scheduling DCM_LOG_UPLOAD Job handle")
-    sleep(60)
-
-@pytest.mark.run(order=5)
-def test_upload_script_started():
-    assert "Start log upload via library API"  in grep_dcmdlogs("Start log upload via library API")
-
-@pytest.mark.run(order=6)
+@pytest.mark.run(order=2)
 def test_fwupdate_script_started():
    assert "Start FW update Script"  in grep_dcmdlogs("Start FW update Script")
    #assert "Starting SoftwareUpdate Utility Script..." in grep_dcmdlogs("Starting SoftwareUpdate Utility Script...")

test/functional-tests/tests/test_log_upload_onreboot_true_case.py

@@ -25,25 +25,12 @@
 import json
 
 @pytest.mark.run(order=1)
-def test_upload_cron_present():
-    assert "urn:settings:LogUploadSettings:UploadSchedule:cron" in grep_dcmdlogs("is present setting cron jobs")
-
-@pytest.mark.run(order=3)
 def test_fw_cron_scheduled():
     sleep(540)
     assert "Scheduling DCM_FW_UPDATE Job handle" in grep_dcmdlogs("Scheduling DCM_FW_UPDATE Job handle")
 
-@pytest.mark.run(order=4)
+@pytest.mark.run(order=2)
 def test_fwupdate_script_started():
     assert "Start FW update Script"  in grep_dcmdlogs("Start FW update Script")
    # assert "Starting SoftwareUpdate Utility Script..." in grep_dcmdlogs("Starting SoftwareUpdate Utility Script...")
    #assert "trigger type=" in grep_dcmdlogs("trigger type=")
-
-@pytest.mark.run(order=4)
-def test_upload_cron_scheduled():
-    assert "Scheduling DCM_LOG_UPLOAD Job handle"  in grep_dcmdlogs("Scheduling DCM_LOG_UPLOAD Job handle")
-
-@pytest.mark.run(order=6)
-def test_upload_started():
-    assert "Start log upload via library API"  in grep_dcmdlogs("Start log upload via library API")
-

test/run_uploadstblogs_l2.sh

@@ -126,9 +126,15 @@ echo "8. Running Upload Strategy Tests..."
 pytest -v --json-report --json-report-summary \
     --json-report-file $RESULT_DIR/upload_strategies.json test/functional-tests/tests/test_uploadstblogs_upload_strategies.py
 
+echo ""
+echo "9. Running Sync Gates Tests..."
+pytest -v --json-report --json-report-summary \
+    --json-report-file $RESULT_DIR/sync_gates.json test/functional-tests/tests/test_uploadstblogs_sync_gates.py
+
 echo ""
 echo "====================================="
 echo "Test Execution Complete"
 echo "====================================="
 echo "Results saved to: $RESULT_DIR"
 echo ""
+