fix: fail deployment when it's aborted

Changelog: Title Ticket: MEN-7693 Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
mendersoftware · Nov 11, 2024 · 9703d03 · 9703d03
1 parent 7efe17e
commit 9703d03
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/core/src/mender-api.c b/core/src/mender-api.c
@@ -486,6 +486,10 @@ mender_api_publish_deployment_status(const char *id, mender_deployment_status_t
     if (204 == status) {
         /* No response expected */
         ret = MENDER_OK;
+    } else if (409 == status) {
+        /* Deployment aborted */
+        mender_api_print_response_error(response, status);
+        ret = MENDER_ABORTED;
     } else {
         mender_api_print_response_error(response, status);
         ret = MENDER_FAIL;

diff --git a/core/src/mender-client.c b/core/src/mender-client.c
@@ -943,12 +943,11 @@ mender_client_update_work_function(void) {
                     mender_log_info("Downloading artifact with id '%s', name '%s', uri '%s'", deployment->id, deployment->artifact_name, deployment->uri);
                 }
 #endif
-                mender_client_publish_deployment_status(deployment->id, MENDER_DEPLOYMENT_STATUS_DOWNLOADING);
-
                 /* Set deployment_id */
                 deployment_id = deployment->id;
 
-                if (MENDER_OK == (ret = mender_download_artifact(deployment->uri, mender_client_deployment_data, &mender_update_module))) {
+                if ((MENDER_ABORTED != mender_client_publish_deployment_status(deployment->id, MENDER_DEPLOYMENT_STATUS_DOWNLOADING))
+                    && MENDER_OK == (ret = mender_download_artifact(deployment->uri, mender_client_deployment_data, &mender_update_module))) {
                     assert(NULL != mender_update_module);
 
                     /* Get artifact context if artifact download succeeded */
@@ -990,8 +989,10 @@ mender_client_update_work_function(void) {
 
             case MENDER_UPDATE_STATE_INSTALL:
                 mender_log_info("Download done, installing artifact");
-                mender_client_publish_deployment_status(deployment_id, MENDER_DEPLOYMENT_STATUS_INSTALLING);
-                if (NULL != mender_update_module->callbacks[update_state]) {
+                if (MENDER_ABORTED == mender_client_publish_deployment_status(deployment_id, MENDER_DEPLOYMENT_STATUS_INSTALLING)) {
+                    ret = MENDER_FAIL;
+                }
+                if ((MENDER_OK == ret) && NULL != mender_update_module->callbacks[update_state]) {
                     ret = mender_update_module->callbacks[update_state](update_state, (mender_update_state_data_t)NULL);
                 }
                 if ((MENDER_OK == ret) && !mender_update_module->requires_reboot) {
@@ -1007,7 +1008,11 @@ mender_client_update_work_function(void) {
             case MENDER_UPDATE_STATE_REBOOT:
                 assert(mender_update_module->requires_reboot);
                 mender_log_info("Artifact installation done, rebooting");
-                mender_client_publish_deployment_status(deployment_id, MENDER_DEPLOYMENT_STATUS_REBOOTING);
+                if (MENDER_ABORTED == mender_client_publish_deployment_status(deployment_id, MENDER_DEPLOYMENT_STATUS_REBOOTING)) {
+                    update_state = MENDER_UPDATE_STATE_FAILURE;
+                    set_and_store_state(update_state);
+                    continue;
+                }
                 if ((MENDER_OK == ret) && (NULL != mender_update_module->callbacks[update_state])) {
                     /* Save the next state before running the reboot callback --
                      * if there is an interrupt (power, crash,...) right after,
@@ -1052,6 +1057,7 @@ mender_client_update_work_function(void) {
                     ret = mender_update_module->callbacks[update_state](update_state, (mender_update_state_data_t)NULL);
                 }
                 if (MENDER_OK == ret) {
+                    /* We don't check for MENDER_ABORTED, as it's too late if it has reached this far */
                     mender_client_publish_deployment_status(deployment_id, MENDER_DEPLOYMENT_STATUS_SUCCESS);
                 }
                 NEXT_STATE;

diff --git a/include/mender-utils.h b/include/mender-utils.h
@@ -92,6 +92,7 @@ typedef enum {
     MENDER_NOT_FOUND       = -2, /**< Not found */
     MENDER_NOT_IMPLEMENTED = -3, /**< Not implemented */
     MENDER_LOOP_DETECTED   = -4, /**< Loop detected */
+    MENDER_ABORTED         = -5, /**< Aborted */
 } mender_err_t;
 
 /**

diff --git a/platform/tls/generic/mbedtls/src/mender-tls.c b/platform/tls/generic/mbedtls/src/mender-tls.c
@@ -195,6 +195,9 @@ mender_tls_init_authentication_keys(mender_err_t (*get_user_provided_keys)(char
         case MENDER_LOOP_DETECTED:
             assert(false && "Unexpected return value");
             /* fallthrough */
+        case MENDER_ABORTED:
+            assert(false && "Unexpected return value");
+            /* fallthrough */
         case MENDER_FAIL:
             mender_log_error("Unable to get authentication keys from store");
             return MENDER_FAIL;